liuqilin 7 years ago
parent
commit
546c0a404d

BIN
.vs/Garden5_2017/v15/Server/sqlite3/storage.ide


BIN
.vs/Garden5_2017/v15/Server/sqlite3/storage.ide-shm


BIN
.vs/Garden5_2017/v15/Server/sqlite3/storage.ide-wal


+ 32 - 0
Assets/Plugins/Alipay/IOS/AlipaySDK.framework.meta

@@ -0,0 +1,32 @@
+fileFormatVersion: 2
+guid: 786969225a8dc4e0eb4e00a91e7e1501
+folderAsset: yes
+timeCreated: 1502698138
+licenseType: Pro
+PluginImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  iconMap: {}
+  executionOrder: {}
+  isPreloaded: 0
+  isOverridable: 0
+  platformData:
+  - first:
+      Any: 
+    second:
+      enabled: 0
+      settings: {}
+  - first:
+      Editor: Editor
+    second:
+      enabled: 0
+      settings:
+        DefaultValueInitialized: true
+  - first:
+      iPhone: iOS
+    second:
+      enabled: 1
+      settings: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 1 - 604
Assets/Resource/Logo.unity

@@ -341,7 +341,7 @@ RectTransform:
   m_PrefabInternal: {fileID: 0}
   m_GameObject: {fileID: 841147520}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 431.5, y: 242.5, z: 0}
+  m_LocalPosition: {x: 488.5, y: 275, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
   - {fileID: 722194762}
@@ -441,609 +441,6 @@ Transform:
   m_Father: {fileID: 0}
   m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!1001 &1410421050
-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: 431.5
-      objectReference: {fileID: 0}
-    - target: {fileID: 224229560457679016, guid: 8647d80b558fa724a84d05f9e6aee9bc,
-        type: 2}
-      propertyPath: m_LocalPosition.y
-      value: 242.5
-      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: 4
-      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}
-    - target: {fileID: 224086116989199640, guid: 8647d80b558fa724a84d05f9e6aee9bc,
-        type: 2}
-      propertyPath: m_LocalPosition.x
-      value: 281.09998
-      objectReference: {fileID: 0}
-    - target: {fileID: 224086116989199640, guid: 8647d80b558fa724a84d05f9e6aee9bc,
-        type: 2}
-      propertyPath: m_LocalPosition.y
-      value: -362.65698
-      objectReference: {fileID: 0}
-    - target: {fileID: 224091459645508686, guid: 8647d80b558fa724a84d05f9e6aee9bc,
-        type: 2}
-      propertyPath: m_LocalPosition.y
-      value: -154.70001
-      objectReference: {fileID: 0}
-    - target: {fileID: 224099813649884984, guid: 8647d80b558fa724a84d05f9e6aee9bc,
-        type: 2}
-      propertyPath: m_LocalPosition.x
-      value: 433.65
-      objectReference: {fileID: 0}
-    - target: {fileID: 224099813649884984, guid: 8647d80b558fa724a84d05f9e6aee9bc,
-        type: 2}
-      propertyPath: m_LocalPosition.y
-      value: 411.42175
-      objectReference: {fileID: 0}
-    - target: {fileID: 224112471647553194, guid: 8647d80b558fa724a84d05f9e6aee9bc,
-        type: 2}
-      propertyPath: m_LocalPosition.y
-      value: -28.749512
-      objectReference: {fileID: 0}
-    - target: {fileID: 224120953201147624, guid: 8647d80b558fa724a84d05f9e6aee9bc,
-        type: 2}
-      propertyPath: m_LocalPosition.y
-      value: 512.5755
-      objectReference: {fileID: 0}
-    - target: {fileID: 224150419401261650, guid: 8647d80b558fa724a84d05f9e6aee9bc,
-        type: 2}
-      propertyPath: m_LocalPosition.x
-      value: 161.23474
-      objectReference: {fileID: 0}
-    - target: {fileID: 224150419401261650, guid: 8647d80b558fa724a84d05f9e6aee9bc,
-        type: 2}
-      propertyPath: m_LocalPosition.y
-      value: 354.55173
-      objectReference: {fileID: 0}
-    - target: {fileID: 224184519637183256, guid: 8647d80b558fa724a84d05f9e6aee9bc,
-        type: 2}
-      propertyPath: m_LocalPosition.x
-      value: -0.00018310547
-      objectReference: {fileID: 0}
-    - target: {fileID: 224184519637183256, guid: 8647d80b558fa724a84d05f9e6aee9bc,
-        type: 2}
-      propertyPath: m_LocalPosition.y
-      value: 443.797
-      objectReference: {fileID: 0}
-    - target: {fileID: 224205480760145378, guid: 8647d80b558fa724a84d05f9e6aee9bc,
-        type: 2}
-      propertyPath: m_LocalPosition.x
-      value: 433.65
-      objectReference: {fileID: 0}
-    - target: {fileID: 224205480760145378, guid: 8647d80b558fa724a84d05f9e6aee9bc,
-        type: 2}
-      propertyPath: m_LocalPosition.y
-      value: 361.64175
-      objectReference: {fileID: 0}
-    - target: {fileID: 224210425470604074, guid: 8647d80b558fa724a84d05f9e6aee9bc,
-        type: 2}
-      propertyPath: m_LocalPosition.x
-      value: 433.65
-      objectReference: {fileID: 0}
-    - target: {fileID: 224210425470604074, guid: 8647d80b558fa724a84d05f9e6aee9bc,
-        type: 2}
-      propertyPath: m_LocalPosition.y
-      value: 361.64175
-      objectReference: {fileID: 0}
-    - target: {fileID: 224229987913313428, guid: 8647d80b558fa724a84d05f9e6aee9bc,
-        type: 2}
-      propertyPath: m_LocalPosition.y
-      value: -28.749512
-      objectReference: {fileID: 0}
-    - target: {fileID: 224246745822826590, guid: 8647d80b558fa724a84d05f9e6aee9bc,
-        type: 2}
-      propertyPath: m_LocalPosition.x
-      value: 107.399994
-      objectReference: {fileID: 0}
-    - target: {fileID: 224246745822826590, guid: 8647d80b558fa724a84d05f9e6aee9bc,
-        type: 2}
-      propertyPath: m_LocalPosition.y
-      value: 558.729
-      objectReference: {fileID: 0}
-    - target: {fileID: 224265650823470674, guid: 8647d80b558fa724a84d05f9e6aee9bc,
-        type: 2}
-      propertyPath: m_LocalPosition.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 224275068483267696, guid: 8647d80b558fa724a84d05f9e6aee9bc,
-        type: 2}
-      propertyPath: m_LocalPosition.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 224299276166683738, guid: 8647d80b558fa724a84d05f9e6aee9bc,
-        type: 2}
-      propertyPath: m_LocalPosition.y
-      value: 512.7435
-      objectReference: {fileID: 0}
-    - target: {fileID: 224310892626649794, guid: 8647d80b558fa724a84d05f9e6aee9bc,
-        type: 2}
-      propertyPath: m_LocalPosition.x
-      value: 380.29993
-      objectReference: {fileID: 0}
-    - target: {fileID: 224310892626649794, guid: 8647d80b558fa724a84d05f9e6aee9bc,
-        type: 2}
-      propertyPath: m_LocalPosition.y
-      value: 131.21167
-      objectReference: {fileID: 0}
-    - target: {fileID: 224315228996335140, guid: 8647d80b558fa724a84d05f9e6aee9bc,
-        type: 2}
-      propertyPath: m_LocalPosition.x
-      value: 0.25003052
-      objectReference: {fileID: 0}
-    - target: {fileID: 224315228996335140, guid: 8647d80b558fa724a84d05f9e6aee9bc,
-        type: 2}
-      propertyPath: m_LocalPosition.y
-      value: 0.026855469
-      objectReference: {fileID: 0}
-    - target: {fileID: 224385199567227060, guid: 8647d80b558fa724a84d05f9e6aee9bc,
-        type: 2}
-      propertyPath: m_LocalPosition.y
-      value: -0.000061035156
-      objectReference: {fileID: 0}
-    - target: {fileID: 224385448420456962, guid: 8647d80b558fa724a84d05f9e6aee9bc,
-        type: 2}
-      propertyPath: m_LocalPosition.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 224392598831522604, guid: 8647d80b558fa724a84d05f9e6aee9bc,
-        type: 2}
-      propertyPath: m_LocalPosition.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 224392598831522604, guid: 8647d80b558fa724a84d05f9e6aee9bc,
-        type: 2}
-      propertyPath: m_LocalPosition.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 224400564893835002, guid: 8647d80b558fa724a84d05f9e6aee9bc,
-        type: 2}
-      propertyPath: m_LocalPosition.y
-      value: -0.0008544922
-      objectReference: {fileID: 0}
-    - target: {fileID: 224426866187220190, guid: 8647d80b558fa724a84d05f9e6aee9bc,
-        type: 2}
-      propertyPath: m_LocalPosition.x
-      value: 203.79999
-      objectReference: {fileID: 0}
-    - target: {fileID: 224426866187220190, guid: 8647d80b558fa724a84d05f9e6aee9bc,
-        type: 2}
-      propertyPath: m_LocalPosition.y
-      value: -362.537
-      objectReference: {fileID: 0}
-    - target: {fileID: 224441247632943000, guid: 8647d80b558fa724a84d05f9e6aee9bc,
-        type: 2}
-      propertyPath: m_LocalPosition.x
-      value: -0.000061035156
-      objectReference: {fileID: 0}
-    - target: {fileID: 224447031464319014, guid: 8647d80b558fa724a84d05f9e6aee9bc,
-        type: 2}
-      propertyPath: m_LocalPosition.x
-      value: 0.00030517578
-      objectReference: {fileID: 0}
-    - target: {fileID: 224447031464319014, guid: 8647d80b558fa724a84d05f9e6aee9bc,
-        type: 2}
-      propertyPath: m_LocalPosition.y
-      value: 512.55194
-      objectReference: {fileID: 0}
-    - target: {fileID: 224454810572374558, guid: 8647d80b558fa724a84d05f9e6aee9bc,
-        type: 2}
-      propertyPath: m_LocalPosition.x
-      value: -118.94
-      objectReference: {fileID: 0}
-    - target: {fileID: 224454810572374558, guid: 8647d80b558fa724a84d05f9e6aee9bc,
-        type: 2}
-      propertyPath: m_LocalPosition.y
-      value: 363.04865
-      objectReference: {fileID: 0}
-    - target: {fileID: 224457616253165912, guid: 8647d80b558fa724a84d05f9e6aee9bc,
-        type: 2}
-      propertyPath: m_LocalPosition.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 224484911662611480, guid: 8647d80b558fa724a84d05f9e6aee9bc,
-        type: 2}
-      propertyPath: m_LocalPosition.x
-      value: 281.09998
-      objectReference: {fileID: 0}
-    - target: {fileID: 224484911662611480, guid: 8647d80b558fa724a84d05f9e6aee9bc,
-        type: 2}
-      propertyPath: m_LocalPosition.y
-      value: -362.65698
-      objectReference: {fileID: 0}
-    - target: {fileID: 224522843245776806, guid: 8647d80b558fa724a84d05f9e6aee9bc,
-        type: 2}
-      propertyPath: m_LocalPosition.x
-      value: -267.5
-      objectReference: {fileID: 0}
-    - target: {fileID: 224522843245776806, guid: 8647d80b558fa724a84d05f9e6aee9bc,
-        type: 2}
-      propertyPath: m_LocalPosition.y
-      value: -517.907
-      objectReference: {fileID: 0}
-    - target: {fileID: 224531325457519484, guid: 8647d80b558fa724a84d05f9e6aee9bc,
-        type: 2}
-      propertyPath: m_LocalPosition.x
-      value: -356.80005
-      objectReference: {fileID: 0}
-    - target: {fileID: 224531325457519484, guid: 8647d80b558fa724a84d05f9e6aee9bc,
-        type: 2}
-      propertyPath: m_LocalPosition.y
-      value: 556.607
-      objectReference: {fileID: 0}
-    - target: {fileID: 224537139003440908, guid: 8647d80b558fa724a84d05f9e6aee9bc,
-        type: 2}
-      propertyPath: m_LocalPosition.x
-      value: 224.09833
-      objectReference: {fileID: 0}
-    - target: {fileID: 224537139003440908, guid: 8647d80b558fa724a84d05f9e6aee9bc,
-        type: 2}
-      propertyPath: m_LocalPosition.y
-      value: -587.90643
-      objectReference: {fileID: 0}
-    - target: {fileID: 224539019914823462, guid: 8647d80b558fa724a84d05f9e6aee9bc,
-        type: 2}
-      propertyPath: m_LocalPosition.x
-      value: 161.23492
-      objectReference: {fileID: 0}
-    - target: {fileID: 224539019914823462, guid: 8647d80b558fa724a84d05f9e6aee9bc,
-        type: 2}
-      propertyPath: m_LocalPosition.y
-      value: 503.68173
-      objectReference: {fileID: 0}
-    - target: {fileID: 224550188810486676, guid: 8647d80b558fa724a84d05f9e6aee9bc,
-        type: 2}
-      propertyPath: m_LocalPosition.x
-      value: -20
-      objectReference: {fileID: 0}
-    - target: {fileID: 224550188810486676, guid: 8647d80b558fa724a84d05f9e6aee9bc,
-        type: 2}
-      propertyPath: m_LocalPosition.y
-      value: 373.48956
-      objectReference: {fileID: 0}
-    - target: {fileID: 224554522440556642, guid: 8647d80b558fa724a84d05f9e6aee9bc,
-        type: 2}
-      propertyPath: m_LocalPosition.x
-      value: -37
-      objectReference: {fileID: 0}
-    - target: {fileID: 224554522440556642, guid: 8647d80b558fa724a84d05f9e6aee9bc,
-        type: 2}
-      propertyPath: m_LocalPosition.y
-      value: 439.1012
-      objectReference: {fileID: 0}
-    - target: {fileID: 224572059650207352, guid: 8647d80b558fa724a84d05f9e6aee9bc,
-        type: 2}
-      propertyPath: m_LocalPosition.x
-      value: -3.9002686
-      objectReference: {fileID: 0}
-    - target: {fileID: 224572059650207352, guid: 8647d80b558fa724a84d05f9e6aee9bc,
-        type: 2}
-      propertyPath: m_LocalPosition.y
-      value: -587.9064
-      objectReference: {fileID: 0}
-    - target: {fileID: 224580230788332784, guid: 8647d80b558fa724a84d05f9e6aee9bc,
-        type: 2}
-      propertyPath: m_LocalPosition.x
-      value: -4.000061
-      objectReference: {fileID: 0}
-    - target: {fileID: 224580230788332784, guid: 8647d80b558fa724a84d05f9e6aee9bc,
-        type: 2}
-      propertyPath: m_LocalPosition.y
-      value: -539.7279
-      objectReference: {fileID: 0}
-    - target: {fileID: 224609626671811272, guid: 8647d80b558fa724a84d05f9e6aee9bc,
-        type: 2}
-      propertyPath: m_LocalPosition.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 224651894813843656, guid: 8647d80b558fa724a84d05f9e6aee9bc,
-        type: 2}
-      propertyPath: m_LocalPosition.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 224658464670550476, guid: 8647d80b558fa724a84d05f9e6aee9bc,
-        type: 2}
-      propertyPath: m_LocalPosition.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 224692999868696848, guid: 8647d80b558fa724a84d05f9e6aee9bc,
-        type: 2}
-      propertyPath: m_LocalPosition.y
-      value: 554.907
-      objectReference: {fileID: 0}
-    - target: {fileID: 224705257369728430, guid: 8647d80b558fa724a84d05f9e6aee9bc,
-        type: 2}
-      propertyPath: m_LocalPosition.x
-      value: 281.09998
-      objectReference: {fileID: 0}
-    - target: {fileID: 224705257369728430, guid: 8647d80b558fa724a84d05f9e6aee9bc,
-        type: 2}
-      propertyPath: m_LocalPosition.y
-      value: -362.65698
-      objectReference: {fileID: 0}
-    - target: {fileID: 224716162044755026, guid: 8647d80b558fa724a84d05f9e6aee9bc,
-        type: 2}
-      propertyPath: m_LocalPosition.x
-      value: -297.69986
-      objectReference: {fileID: 0}
-    - target: {fileID: 224716162044755026, guid: 8647d80b558fa724a84d05f9e6aee9bc,
-        type: 2}
-      propertyPath: m_LocalPosition.y
-      value: 231.50699
-      objectReference: {fileID: 0}
-    - target: {fileID: 224722632151102834, guid: 8647d80b558fa724a84d05f9e6aee9bc,
-        type: 2}
-      propertyPath: m_LocalPosition.x
-      value: -129.5
-      objectReference: {fileID: 0}
-    - target: {fileID: 224722632151102834, guid: 8647d80b558fa724a84d05f9e6aee9bc,
-        type: 2}
-      propertyPath: m_LocalPosition.y
-      value: 307.73956
-      objectReference: {fileID: 0}
-    - target: {fileID: 224731758561882008, guid: 8647d80b558fa724a84d05f9e6aee9bc,
-        type: 2}
-      propertyPath: m_LocalPosition.x
-      value: 14.5
-      objectReference: {fileID: 0}
-    - target: {fileID: 224731758561882008, guid: 8647d80b558fa724a84d05f9e6aee9bc,
-        type: 2}
-      propertyPath: m_LocalPosition.y
-      value: 241.94559
-      objectReference: {fileID: 0}
-    - target: {fileID: 224747832885531626, guid: 8647d80b558fa724a84d05f9e6aee9bc,
-        type: 2}
-      propertyPath: m_LocalPosition.x
-      value: -356.80005
-      objectReference: {fileID: 0}
-    - target: {fileID: 224747832885531626, guid: 8647d80b558fa724a84d05f9e6aee9bc,
-        type: 2}
-      propertyPath: m_LocalPosition.y
-      value: 556.107
-      objectReference: {fileID: 0}
-    - target: {fileID: 224779440116827300, guid: 8647d80b558fa724a84d05f9e6aee9bc,
-        type: 2}
-      propertyPath: m_LocalPosition.x
-      value: -132.90002
-      objectReference: {fileID: 0}
-    - target: {fileID: 224779440116827300, guid: 8647d80b558fa724a84d05f9e6aee9bc,
-        type: 2}
-      propertyPath: m_LocalPosition.y
-      value: 0.22125244
-      objectReference: {fileID: 0}
-    - target: {fileID: 224804073292249356, guid: 8647d80b558fa724a84d05f9e6aee9bc,
-        type: 2}
-      propertyPath: m_LocalPosition.x
-      value: 267.8
-      objectReference: {fileID: 0}
-    - target: {fileID: 224804073292249356, guid: 8647d80b558fa724a84d05f9e6aee9bc,
-        type: 2}
-      propertyPath: m_LocalPosition.y
-      value: 558.729
-      objectReference: {fileID: 0}
-    - target: {fileID: 224840547970510414, guid: 8647d80b558fa724a84d05f9e6aee9bc,
-        type: 2}
-      propertyPath: m_LocalPosition.x
-      value: 365
-      objectReference: {fileID: 0}
-    - target: {fileID: 224840547970510414, guid: 8647d80b558fa724a84d05f9e6aee9bc,
-        type: 2}
-      propertyPath: m_LocalPosition.y
-      value: -554.62695
-      objectReference: {fileID: 0}
-    - target: {fileID: 224843116074166976, guid: 8647d80b558fa724a84d05f9e6aee9bc,
-        type: 2}
-      propertyPath: m_LocalPosition.y
-      value: 551.78656
-      objectReference: {fileID: 0}
-    - target: {fileID: 224884269752229032, guid: 8647d80b558fa724a84d05f9e6aee9bc,
-        type: 2}
-      propertyPath: m_LocalPosition.x
-      value: 72.09894
-      objectReference: {fileID: 0}
-    - target: {fileID: 224884269752229032, guid: 8647d80b558fa724a84d05f9e6aee9bc,
-        type: 2}
-      propertyPath: m_LocalPosition.y
-      value: -587.90607
-      objectReference: {fileID: 0}
-    - target: {fileID: 224885158513677532, guid: 8647d80b558fa724a84d05f9e6aee9bc,
-        type: 2}
-      propertyPath: m_LocalPosition.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 224893316639651102, guid: 8647d80b558fa724a84d05f9e6aee9bc,
-        type: 2}
-      propertyPath: m_LocalPosition.x
-      value: 149.0998
-      objectReference: {fileID: 0}
-    - target: {fileID: 224893316639651102, guid: 8647d80b558fa724a84d05f9e6aee9bc,
-        type: 2}
-      propertyPath: m_LocalPosition.y
-      value: -587.9066
-      objectReference: {fileID: 0}
-    - target: {fileID: 224927080000622308, guid: 8647d80b558fa724a84d05f9e6aee9bc,
-        type: 2}
-      propertyPath: m_LocalPosition.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 224961117816331688, guid: 8647d80b558fa724a84d05f9e6aee9bc,
-        type: 2}
-      propertyPath: m_LocalPosition.x
-      value: -297.69998
-      objectReference: {fileID: 0}
-    - target: {fileID: 224961117816331688, guid: 8647d80b558fa724a84d05f9e6aee9bc,
-        type: 2}
-      propertyPath: m_LocalPosition.y
-      value: 231.50699
-      objectReference: {fileID: 0}
-    - target: {fileID: 1948781497737682, guid: 8647d80b558fa724a84d05f9e6aee9bc, type: 2}
-      propertyPath: m_Name
-      value: Canvas (1)
-      objectReference: {fileID: 0}
-    - target: {fileID: 224514817400265690, guid: 8647d80b558fa724a84d05f9e6aee9bc,
-        type: 2}
-      propertyPath: m_LocalPosition.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 224679397496895964, guid: 8647d80b558fa724a84d05f9e6aee9bc,
-        type: 2}
-      propertyPath: m_LocalPosition.y
-      value: -36.20703
-      objectReference: {fileID: 0}
-    - target: {fileID: 224410250384729040, guid: 8647d80b558fa724a84d05f9e6aee9bc,
-        type: 2}
-      propertyPath: m_LocalPosition.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 224694386806689142, guid: 8647d80b558fa724a84d05f9e6aee9bc,
-        type: 2}
-      propertyPath: m_LocalPosition.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 224556376707151520, guid: 8647d80b558fa724a84d05f9e6aee9bc,
-        type: 2}
-      propertyPath: m_LocalPosition.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 224549302067237646, guid: 8647d80b558fa724a84d05f9e6aee9bc,
-        type: 2}
-      propertyPath: m_LocalPosition.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 224216352824261512, guid: 8647d80b558fa724a84d05f9e6aee9bc,
-        type: 2}
-      propertyPath: m_LocalPosition.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 224429567860854048, guid: 8647d80b558fa724a84d05f9e6aee9bc,
-        type: 2}
-      propertyPath: m_LocalPosition.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 224821526948636738, guid: 8647d80b558fa724a84d05f9e6aee9bc,
-        type: 2}
-      propertyPath: m_LocalPosition.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 224659296306368858, guid: 8647d80b558fa724a84d05f9e6aee9bc,
-        type: 2}
-      propertyPath: m_LocalPosition.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 224181304112279672, guid: 8647d80b558fa724a84d05f9e6aee9bc,
-        type: 2}
-      propertyPath: m_LocalPosition.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 224513441037128402, guid: 8647d80b558fa724a84d05f9e6aee9bc,
-        type: 2}
-      propertyPath: m_LocalPosition.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 224499353917912188, guid: 8647d80b558fa724a84d05f9e6aee9bc,
-        type: 2}
-      propertyPath: m_LocalPosition.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 224317587197903578, guid: 8647d80b558fa724a84d05f9e6aee9bc,
-        type: 2}
-      propertyPath: m_LocalPosition.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 1948781497737682, guid: 8647d80b558fa724a84d05f9e6aee9bc, type: 2}
-      propertyPath: m_IsActive
-      value: 0
-      objectReference: {fileID: 0}
-    m_RemovedComponents: []
-  m_ParentPrefab: {fileID: 100100000, guid: 8647d80b558fa724a84d05f9e6aee9bc, type: 2}
-  m_IsPrefabParent: 0
 --- !u!1 &1511433816
 GameObject:
   m_ObjectHideFlags: 0

+ 271 - 0
Assets/Resource/Prefab/Object/Garden.prefab

@@ -105,6 +105,21 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 0
+--- !u!1 &1190183145941090
+GameObject:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  serializedVersion: 5
+  m_Component:
+  - component: {fileID: 4024228029520060}
+  m_Layer: 5
+  m_Name: PhotoShop
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
 --- !u!1 &1256352428073408
 GameObject:
   m_ObjectHideFlags: 1
@@ -121,6 +136,22 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 0
+--- !u!1 &1282667609278624
+GameObject:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  serializedVersion: 5
+  m_Component:
+  - component: {fileID: 4588216630637812}
+  - component: {fileID: 212563239013512148}
+  m_Layer: 0
+  m_Name: PhotoShopBg
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
 --- !u!1 &1313790546883648
 GameObject:
   m_ObjectHideFlags: 1
@@ -183,6 +214,22 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
+--- !u!1 &1399450636664792
+GameObject:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  serializedVersion: 5
+  m_Component:
+  - component: {fileID: 4694261110752360}
+  - component: {fileID: 212722959070800348}
+  m_Layer: 0
+  m_Name: PhotoShopShadow
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
 --- !u!1 &1407192791261292
 GameObject:
   m_ObjectHideFlags: 1
@@ -415,6 +462,22 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
+--- !u!1 &1613910783807824
+GameObject:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  serializedVersion: 5
+  m_Component:
+  - component: {fileID: 4040572101889252}
+  - component: {fileID: 20538975865931150}
+  m_Layer: 5
+  m_Name: PhotoShopCamera
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
 --- !u!1 &1665676138942020
 GameObject:
   m_ObjectHideFlags: 1
@@ -479,6 +542,21 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 0
+--- !u!1 &1721322120182818
+GameObject:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  serializedVersion: 5
+  m_Component:
+  - component: {fileID: 4285244055568782}
+  m_Layer: 0
+  m_Name: PhotoShopPlayer
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
 --- !u!1 &1728925240400126
 GameObject:
   m_ObjectHideFlags: 1
@@ -671,6 +749,34 @@ Transform:
   m_Father: {fileID: 4257060777002720}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!4 &4024228029520060
+Transform:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1190183145941090}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: -15.46, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children:
+  - {fileID: 4588216630637812}
+  - {fileID: 4040572101889252}
+  m_Father: {fileID: 4257060777002720}
+  m_RootOrder: 3
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!4 &4040572101889252
+Transform:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1613910783807824}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: -0.45000076, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 4024228029520060}
+  m_RootOrder: 1
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!4 &4068698844593858
 Transform:
   m_ObjectHideFlags: 1
@@ -794,6 +900,7 @@ Transform:
   - {fileID: 4008559618325982}
   - {fileID: 4576759688754552}
   - {fileID: 224526022893638850}
+  - {fileID: 4024228029520060}
   m_Father: {fileID: 0}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -810,6 +917,19 @@ Transform:
   m_Father: {fileID: 4008559618325982}
   m_RootOrder: 3
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!4 &4285244055568782
+Transform:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1721322120182818}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: -5.82, y: -3.33, z: -1}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 4588216630637812}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!4 &4321082446622300
 Transform:
   m_ObjectHideFlags: 1
@@ -1005,6 +1125,21 @@ Transform:
   m_Father: {fileID: 4008559618325982}
   m_RootOrder: 7
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!4 &4588216630637812
+Transform:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1282667609278624}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: -0.45000076, z: 2}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children:
+  - {fileID: 4285244055568782}
+  - {fileID: 4694261110752360}
+  m_Father: {fileID: 4024228029520060}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!4 &4594713365202588
 Transform:
   m_ObjectHideFlags: 1
@@ -1057,6 +1192,19 @@ Transform:
   m_Father: {fileID: 4008559618325982}
   m_RootOrder: 9
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!4 &4694261110752360
+Transform:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1399450636664792}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: -5.84, y: -3.38, z: -1}
+  m_LocalScale: {x: 1.2, y: 1.2, z: 1.2}
+  m_Children: []
+  m_Father: {fileID: 4588216630637812}
+  m_RootOrder: 1
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!4 &4732436779443374
 Transform:
   m_ObjectHideFlags: 1
@@ -1205,6 +1353,41 @@ Transform:
   m_Father: {fileID: 4243570825903678}
   m_RootOrder: 4
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!20 &20538975865931150
+Camera:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1613910783807824}
+  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.56
+  m_Depth: 0
+  m_CullingMask:
+    serializedVersion: 2
+    m_Bits: 4294967295
+  m_RenderingPath: -1
+  m_TargetTexture: {fileID: 8400000, guid: d34f4dbba81b1b743a561b7bfedd9de0, type: 2}
+  m_TargetDisplay: 0
+  m_TargetEye: 3
+  m_HDR: 1
+  m_AllowMSAA: 1
+  m_ForceIntoRT: 0
+  m_OcclusionCulling: 1
+  m_StereoConvergence: 10
+  m_StereoSeparation: 0.022
 --- !u!61 &61724106738148120
 BoxCollider2D:
   m_ObjectHideFlags: 1
@@ -1731,6 +1914,50 @@ SpriteRenderer:
   m_SpriteTileMode: 0
   m_WasSpriteAssigned: 1
   m_MaskInteraction: 0
+--- !u!212 &212563239013512148
+SpriteRenderer:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1282667609278624}
+  m_Enabled: 1
+  m_CastShadows: 0
+  m_ReceiveShadows: 0
+  m_DynamicOccludee: 1
+  m_MotionVectors: 1
+  m_LightProbeUsage: 1
+  m_ReflectionProbeUsage: 1
+  m_Materials:
+  - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0}
+  m_StaticBatchInfo:
+    firstSubMesh: 0
+    subMeshCount: 0
+  m_StaticBatchRoot: {fileID: 0}
+  m_ProbeAnchor: {fileID: 0}
+  m_LightProbeVolumeOverride: {fileID: 0}
+  m_ScaleInLightmap: 1
+  m_PreserveUVs: 0
+  m_IgnoreNormalsForChartDetection: 0
+  m_ImportantGI: 0
+  m_StitchLightmapSeams: 0
+  m_SelectedEditorRenderState: 0
+  m_MinimumChartSize: 4
+  m_AutoUVMaxDistance: 0.5
+  m_AutoUVMaxAngle: 89
+  m_LightmapParameters: {fileID: 0}
+  m_SortingLayerID: 0
+  m_SortingLayer: 0
+  m_SortingOrder: 0
+  m_Sprite: {fileID: 21300000, guid: f16cd7e57d83b50409772d65f476f475, type: 3}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_FlipX: 0
+  m_FlipY: 0
+  m_DrawMode: 0
+  m_Size: {x: 19.2, y: 10.8}
+  m_AdaptiveModeThreshold: 0.5
+  m_SpriteTileMode: 0
+  m_WasSpriteAssigned: 1
+  m_MaskInteraction: 0
 --- !u!212 &212678618548551084
 SpriteRenderer:
   m_ObjectHideFlags: 1
@@ -1819,6 +2046,50 @@ SpriteRenderer:
   m_SpriteTileMode: 0
   m_WasSpriteAssigned: 1
   m_MaskInteraction: 0
+--- !u!212 &212722959070800348
+SpriteRenderer:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1399450636664792}
+  m_Enabled: 1
+  m_CastShadows: 0
+  m_ReceiveShadows: 0
+  m_DynamicOccludee: 1
+  m_MotionVectors: 1
+  m_LightProbeUsage: 1
+  m_ReflectionProbeUsage: 1
+  m_Materials:
+  - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0}
+  m_StaticBatchInfo:
+    firstSubMesh: 0
+    subMeshCount: 0
+  m_StaticBatchRoot: {fileID: 0}
+  m_ProbeAnchor: {fileID: 0}
+  m_LightProbeVolumeOverride: {fileID: 0}
+  m_ScaleInLightmap: 1
+  m_PreserveUVs: 0
+  m_IgnoreNormalsForChartDetection: 0
+  m_ImportantGI: 0
+  m_StitchLightmapSeams: 0
+  m_SelectedEditorRenderState: 0
+  m_MinimumChartSize: 4
+  m_AutoUVMaxDistance: 0.5
+  m_AutoUVMaxAngle: 89
+  m_LightmapParameters: {fileID: 0}
+  m_SortingLayerID: 0
+  m_SortingLayer: 0
+  m_SortingOrder: 0
+  m_Sprite: {fileID: 21300236, guid: c486bd2e1e577b24a86013546709abda, type: 3}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_FlipX: 0
+  m_FlipY: 0
+  m_DrawMode: 0
+  m_Size: {x: 2.1, y: 0.4}
+  m_AdaptiveModeThreshold: 0.5
+  m_SpriteTileMode: 0
+  m_WasSpriteAssigned: 1
+  m_MaskInteraction: 0
 --- !u!212 &212760045093916298
 SpriteRenderer:
   m_ObjectHideFlags: 1

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


+ 1 - 1
Assets/Resource/Shader/DragonboneUGUIMat.mat

@@ -39,7 +39,7 @@ Material:
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
     - _MainTex:
-        m_Texture: {fileID: 2800000, guid: c486bd2e1e577b24a86013546709abda, type: 3}
+        m_Texture: {fileID: 2800000, guid: c0256ea9e745dc544ae7035b55f87b84, type: 3}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
     - _MetallicGlossMap:

+ 10 - 0
Assets/Resource/Sprite/Editor/HotUpdate/NewFlower.meta

@@ -0,0 +1,10 @@
+fileFormatVersion: 2
+guid: 46b274c8414a222419da71c9a4da16df
+folderAsset: yes
+timeCreated: 1516869190
+licenseType: Pro
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 29 - 0
Assets/Resource/Sprite/PhotoShop.renderTexture

@@ -0,0 +1,29 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!84 &8400000
+RenderTexture:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_Name: PhotoShop
+  m_ImageContentsHash:
+    serializedVersion: 2
+    Hash: 00000000000000000000000000000000
+  m_Width: 1024
+  m_Height: 576
+  m_AntiAliasing: 1
+  m_DepthFormat: 2
+  m_ColorFormat: 0
+  m_MipMap: 0
+  m_GenerateMips: 1
+  m_SRGB: 0
+  m_TextureSettings:
+    serializedVersion: 2
+    m_FilterMode: 1
+    m_Aniso: 0
+    m_MipBias: 0
+    m_WrapU: 1
+    m_WrapV: 1
+    m_WrapW: 1
+  m_Dimension: 2
+  m_VolumeDepth: 1

+ 10 - 0
Assets/Resource/Sprite/PhotoShop.renderTexture.meta

@@ -0,0 +1,10 @@
+fileFormatVersion: 2
+guid: d34f4dbba81b1b743a561b7bfedd9de0
+timeCreated: 1525923266
+licenseType: Pro
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 8400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

BIN
Assets/Resource/Xlsx/language_config.xlsx


+ 40 - 40
Assets/Script/Label/CanvasLabel.cs

@@ -770,33 +770,6 @@ public class CanvasLabel
     public static string S_ScrollRect = "S_ScrollRect";
     public static string S_Grid = "S_Grid";
     public static string S_Tit = "S_Tit";
-    public static string Z_PlazaRoomList = "Z_PlazaRoomList";
-    public static string Z_BK = "Z_BK";
-    public static string Z_Panel = "Z_Panel";
-    public static string Z_Create = "Z_Create";
-    public static string Z_CreateLab = "Z_CreateLab";
-    public static string Z_Close = "Z_Close";
-    public static string Z_CloseLab = "Z_CloseLab";
-    public static string Z_ScrollRect = "Z_ScrollRect";
-    public static string Z_Frame = "Z_Frame";
-    public static string Z_Grid = "Z_Grid";
-    public static string Z_Tit = "Z_Tit";
-    public static string Z_Info = "Z_Info";
-    public static string Z_Info0 = "Z_Info0";
-    public static string Z_InfoLab0 = "Z_InfoLab0";
-    public static string Z_Info1 = "Z_Info1";
-    public static string Z_InfoLab1 = "Z_InfoLab1";
-    public static string Z_Info2 = "Z_Info2";
-    public static string Z_InfoLab2 = "Z_InfoLab2";
-    public static string Z_Info3 = "Z_Info3";
-    public static string Z_InfoLab3 = "Z_InfoLab3";
-    public static string Z_Info4 = "Z_Info4";
-    public static string Z_InfoLab4 = "Z_InfoLab4";
-    public static string Z_Info5 = "Z_Info5";
-    public static string Z_InfoImg50 = "Z_InfoImg50";
-    public static string Z_InfoImg51 = "Z_InfoImg51";
-    public static string Z_InfoLab5 = "Z_InfoLab5";
-    public static string Z_Tip = "Z_Tip";
     public static string AA_CreatePlazaRoom = "AA_CreatePlazaRoom";
     public static string AA_Panel = "AA_Panel";
     public static string AA_Lab = "AA_Lab";
@@ -824,6 +797,33 @@ public class CanvasLabel
     public static string AAb_HandleSlideArea = "AAb_HandleSlideArea";
     public static string AAb_Handle = "AAb_Handle";
     public static string AA_Tip = "AA_Tip";
+    public static string Z_PlazaRoomList = "Z_PlazaRoomList";
+    public static string Z_BK = "Z_BK";
+    public static string Z_Panel = "Z_Panel";
+    public static string Z_Create = "Z_Create";
+    public static string Z_CreateLab = "Z_CreateLab";
+    public static string Z_Close = "Z_Close";
+    public static string Z_CloseLab = "Z_CloseLab";
+    public static string Z_ScrollRect = "Z_ScrollRect";
+    public static string Z_Frame = "Z_Frame";
+    public static string Z_Grid = "Z_Grid";
+    public static string Z_Tit = "Z_Tit";
+    public static string Z_Info = "Z_Info";
+    public static string Z_Info0 = "Z_Info0";
+    public static string Z_InfoLab0 = "Z_InfoLab0";
+    public static string Z_Info1 = "Z_Info1";
+    public static string Z_InfoLab1 = "Z_InfoLab1";
+    public static string Z_Info2 = "Z_Info2";
+    public static string Z_InfoLab2 = "Z_InfoLab2";
+    public static string Z_Info3 = "Z_Info3";
+    public static string Z_InfoLab3 = "Z_InfoLab3";
+    public static string Z_Info4 = "Z_Info4";
+    public static string Z_InfoLab4 = "Z_InfoLab4";
+    public static string Z_Info5 = "Z_Info5";
+    public static string Z_InfoImg50 = "Z_InfoImg50";
+    public static string Z_InfoImg51 = "Z_InfoImg51";
+    public static string Z_InfoLab5 = "Z_InfoLab5";
+    public static string Z_Tip = "Z_Tip";
     public static string W_HudParent = "W_HudParent";
     public static string I_BlackMask = "I_BlackMask";
     public static string I_Lab = "I_Lab";
@@ -913,19 +913,6 @@ public class CanvasLabel
     public static string O_Pos = "O_Pos";
     public static string O_Lab = "O_Lab";
     public static string V_BlackMask = "V_BlackMask";
-    public static string T_NickName = "T_NickName";
-    public static string T_NickNameBK = "T_NickNameBK";
-    public static string T_NickNameCard = "T_NickNameCard";
-    public static string T_CloseParent = "T_CloseParent";
-    public static string T_Close = "T_Close";
-    public static string T_Confirm = "T_Confirm";
-    public static string T_ConfirmLab = "T_ConfirmLab";
-    public static string T_Tit = "T_Tit";
-    public static string T_InputField = "T_InputField";
-    public static string T_InputLab = "T_InputLab";
-    public static string T_Random = "T_Random";
-    public static string T_CostTxt = "T_CostTxt";
-    public static string T_CostImagePlus = "T_CostImagePlus";
     public static string AC_EnterMinigamePanelMask = "AC_EnterMinigamePanelMask";
     public static string AC_EnterMinigamePanel = "AC_EnterMinigamePanel";
     public static string AC_Title = "AC_Title";
@@ -942,6 +929,19 @@ public class CanvasLabel
     public static string AC_ScrollPos2 = "AC_ScrollPos2";
     public static string AC_GamaTypeText0 = "AC_GamaTypeText0";
     public static string AC_GamaTypeText1 = "AC_GamaTypeText1";
+    public static string T_NickName = "T_NickName";
+    public static string T_NickNameBK = "T_NickNameBK";
+    public static string T_NickNameCard = "T_NickNameCard";
+    public static string T_CloseParent = "T_CloseParent";
+    public static string T_Close = "T_Close";
+    public static string T_Confirm = "T_Confirm";
+    public static string T_ConfirmLab = "T_ConfirmLab";
+    public static string T_Tit = "T_Tit";
+    public static string T_InputField = "T_InputField";
+    public static string T_InputLab = "T_InputLab";
+    public static string T_Random = "T_Random";
+    public static string T_CostTxt = "T_CostTxt";
+    public static string T_CostImagePlus = "T_CostImagePlus";
     public static string AE_PlazaroomMemberPanelParent = "AE_PlazaroomMemberPanelParent";
     public static string AE_PlazaroomMemberPanelMask = "AE_PlazaroomMemberPanelMask";
     public static string AE_PlazaroomMemberPanel = "AE_PlazaroomMemberPanel";

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

@@ -0,0 +1,34 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class PhotoShopCamera : MonoBehaviour 
+{
+    public Camera shotCam;
+    public Action<Texture2D> onRenderFinish;
+
+    public void Awake()
+    {
+        shotCam = GetComponent<Camera>();
+    }
+
+    public void OnPostRender()
+    {
+        //设定当前RenderTexture为快照相机的targetTexture
+        RenderTexture rt = shotCam.targetTexture;
+        RenderTexture.active = rt;
+        Texture2D tex = new Texture2D(rt.width, rt.height);
+        
+        //读取缓冲区像素信息
+        tex.ReadPixels(new Rect(0, 0, rt.width, rt.height), 0, 0);
+        tex.Apply();
+
+        if (onRenderFinish != null)
+        {
+            onRenderFinish.Invoke(tex);
+        }
+
+        Destroy(tex);
+    }
+}

+ 13 - 0
Assets/Script/Manage/PhotoShopCamera.cs.meta

@@ -0,0 +1,13 @@
+fileFormatVersion: 2
+guid: cdc646dba158d0946b7bcd8d6c0c57c5
+timeCreated: 1525922907
+licenseType: Pro
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 20 - 1
Assets/Script/Object/Player.cs

@@ -1245,6 +1245,25 @@ public class Player : Regist , IPointerClickHandler
         return names;
     }
 
+    public List<string> GetAllDressNames()
+    {
+        List<string> names = new List<string>();
+        names.Add(Head);
+        names.Add(Dress);
+        names.Add(Shoe);
+        names.Add(HeadWear);
+        names.Add(Top);
+        if (PlayAnimFlag1) names.Add(TempClose);
+        else names.Add(Eye);
+        names.Add(Mouse);
+        names.Add(Wing);
+        names.Add(LeftLongSleeve);
+        names.Add(LeftShortSleeve);
+        names.Add(RightLongSleeve);
+        names.Add(RightShortSleeve);
+        return names;
+    }
+
     public void BuyDressNavigate(List<CloseItem> closeUnitList)
     {
         for (int i = 0; i < closeUnitList.Count; i++)
@@ -1498,7 +1517,7 @@ public class Player : Regist , IPointerClickHandler
     }
 
 
-    private List<UnityUGUIDisplay> uguiDisplays;
+    public List<UnityUGUIDisplay> uguiDisplays;
     public void DisplayInUI(float scale, bool adjustScale)
     {
         uguiDisplays = new List<UnityUGUIDisplay>();

+ 66 - 6
Assets/Script/Social/FashionShowCloseBox.cs

@@ -1,4 +1,7 @@
+using System.Collections;
 using System.Collections.Generic;
+using System.IO;
+using repeatCallUtility;
 using UnityEngine;
 using UnityEngine.UI;
 
@@ -8,6 +11,7 @@ public class FashionShowCloseCell
 
     //public bool Praised;
     public Text PraiseText;
+    public Image ShadowImg;
     public Button PraiseButton;
     public Button ShareButton;
     public Button DisplayButton;
@@ -16,9 +20,10 @@ public class FashionShowCloseCell
 
     #endregion
 
-    public FashionShowCloseCell(Text praiseText, Button praiseButton, Button shareButton, Button displayButton)
+    public FashionShowCloseCell(Text praiseText, Image shadowImg, Button praiseButton, Button shareButton, Button displayButton)
     {
         PraiseText = praiseText;
+        ShadowImg = shadowImg;
         PraiseButton = praiseButton;
         ShareButton = shareButton;
         DisplayButton = displayButton;
@@ -58,9 +63,54 @@ public class FashionShowCloseCell
         }
     }
 
+    public static Player photoShopPlayer;
+    public string path = Application.persistentDataPath + "\\FashionShow.png";
     private void OnShareButtonClick()
     {
+        if (photoShopPlayer != null)
+        {
+            Object.Destroy(photoShopPlayer.gameObject);
+        }
+
         AudioManager.PlayClip(ResourceLabel.BtnClip);
+
+        ResourceManager.Get("PhotoShop").SetParent(null);
+        ResourceManager.Get("PhotoShop").SetActive(true);
+
+        photoShopPlayer = PlayerManager.Instance.GetRawPlayer();
+        PlayerManager.BuildPlayer(Player.GetAllDressNames(), photoShopPlayer);
+        photoShopPlayer.SetParent(ResourceManager.Get("PhotoShopPlayer"));
+        photoShopPlayer.transform.localPosition = new Vector3(0, 0, -1);
+        photoShopPlayer.ResetDepth();
+
+        Camera camera = ResourceManager.Get<Camera>("PhotoShopCamera");
+        PhotoShopCamera shopCamera = camera.GetComponent<PhotoShopCamera>();
+        if (shopCamera == null)
+        {
+            shopCamera = camera.AddComponent<PhotoShopCamera>();
+        }
+        shopCamera.onRenderFinish = null;
+        shopCamera.onRenderFinish += ScreenShot;
+    }
+
+    private void ScreenShot(Texture2D tex)
+    {
+        float left = 0.02f;
+        float right = 0.4f;
+        float top = 0.8f;
+        float bottom = 0.05f;
+        int width = (int)(tex.width * (right - left));
+        int height = (int)(tex.height * (top - bottom));
+        int leftOffset = (int)(tex.width * left);
+        int bottomOffset = (int)(tex.height * bottom);
+        Texture2D newTex = new Texture2D(width, height);
+        newTex.SetPixels(tex.GetPixels(leftOffset, bottomOffset, width, height));
+        newTex.Apply();
+        File.WriteAllBytes(path, newTex.EncodeToJPG());
+
+        ResourceManager.Get("PhotoShop").SetActive(false);
+
+        IAPManager.Share(path, Language.GetStr(LanguageLabel.Common__ScreenShotShareContent));
     }
 
     private void OnPraiseButtonClick()
@@ -114,6 +164,11 @@ public class FashionShowCloseBox : VirtualScrollRectItem
     private Text C_PraiseText;
     private Text D_PraiseText;
     private Text E_PraiseText;
+    private Image A_Img;
+    private Image B_Img;
+    private Image C_Img;
+    private Image D_Img;
+    private Image E_Img;
     private Button A_DisplayBackground;
     private Button A_PraiseButton;
     private Button A_ShareButton;
@@ -178,6 +233,11 @@ public class FashionShowCloseBox : VirtualScrollRectItem
         C_PraiseText = childDictionary[FashionShowCloseBoxLabel.C_PraiseText].GetComponent<Text>();
         D_PraiseText = childDictionary[FashionShowCloseBoxLabel.D_PraiseText].GetComponent<Text>();
         E_PraiseText = childDictionary[FashionShowCloseBoxLabel.E_PraiseText].GetComponent<Text>();
+        A_Img = childDictionary["A_Image"].GetComponent<Image>();
+        B_Img = childDictionary["A_Image"].GetComponent<Image>();
+        C_Img = childDictionary["A_Image"].GetComponent<Image>();
+        D_Img = childDictionary["A_Image"].GetComponent<Image>();
+        E_Img = childDictionary["A_Image"].GetComponent<Image>();
         A_DisplayBackground = childDictionary[FashionShowCloseBoxLabel.A_DisplayBackground].GetComponent<Button>();
         A_PraiseButton = childDictionary[FashionShowCloseBoxLabel.A_PraiseButton].GetComponent<Button>();
         A_ShareButton = childDictionary[FashionShowCloseBoxLabel.A_ShareButton].GetComponent<Button>();
@@ -195,11 +255,11 @@ public class FashionShowCloseBox : VirtualScrollRectItem
         E_ShareButton = childDictionary[FashionShowCloseBoxLabel.E_ShareButton].GetComponent<Button>();
         //RegistEndMark-Used by LabelUtility-Do not remove   
 
-        Cells.Add(new FashionShowCloseCell(A_PraiseText, A_PraiseButton, A_ShareButton, A_DisplayBackground));
-        Cells.Add(new FashionShowCloseCell(B_PraiseText, B_PraiseButton, B_ShareButton, B_DisplayBackground));
-        Cells.Add(new FashionShowCloseCell(C_PraiseText, C_PraiseButton, C_ShareButton, C_DisplayBackground));
-        Cells.Add(new FashionShowCloseCell(D_PraiseText, D_PraiseButton, D_ShareButton, D_DisplayBackground));
-        Cells.Add(new FashionShowCloseCell(E_PraiseText, E_PraiseButton, E_ShareButton, E_DisplayBackground));
+        Cells.Add(new FashionShowCloseCell(A_PraiseText, A_Img, A_PraiseButton, A_ShareButton, A_DisplayBackground));
+        Cells.Add(new FashionShowCloseCell(B_PraiseText, B_Img, B_PraiseButton, B_ShareButton, B_DisplayBackground));
+        Cells.Add(new FashionShowCloseCell(C_PraiseText, C_Img, C_PraiseButton, C_ShareButton, C_DisplayBackground));
+        Cells.Add(new FashionShowCloseCell(D_PraiseText, D_Img, D_PraiseButton, D_ShareButton, D_DisplayBackground));
+        Cells.Add(new FashionShowCloseCell(E_PraiseText, E_Img, E_PraiseButton, E_ShareButton, E_DisplayBackground));
         reset();
 
         return false;

+ 1 - 0
ProjectSettings/GraphicsSettings.asset

@@ -39,6 +39,7 @@ GraphicsSettings:
   - {fileID: 4800000, guid: ac390d8200b91bd419e2d7b9e580d07d, type: 3}
   - {fileID: 4800000, guid: e73e8e8cfe7b2344abcbf572918e22a1, type: 3}
   - {fileID: 16000, guid: 0000000000000000f000000000000000, type: 0}
+  - {fileID: 16002, guid: 0000000000000000f000000000000000, type: 0}
   m_PreloadedShaders: []
   m_SpritesDefaultMaterial: {fileID: 10754, guid: 0000000000000000f000000000000000,
     type: 0}

+ 1 - 1
ProjectSettings/UnityConnectSettings.asset

@@ -31,6 +31,6 @@ UnityConnectSettings:
     m_GameIds:
       AndroidPlayer: 1408493
       iPhonePlayer: 1408492
-    m_GameId: 
+    m_GameId: 1408493
   PerformanceReportingSettings:
     m_Enabled: 0

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