Selaa lähdekoodia

修改几个细节

LiuQilin 7 vuotta sitten
vanhempi
commit
4349c17115

+ 203 - 103
Assets/Resource/Logo.unity

@@ -155,6 +155,106 @@ SpriteRenderer:
   m_Color: {r: 0, g: 0, b: 0, a: 1}
   m_FlipX: 0
   m_FlipY: 0
+--- !u!1001 &834019238
+Prefab:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 1678569582}
+    m_Modifications:
+    - target: {fileID: 224198081419304548, guid: 4b27b1fc0c9780a4492f68549d3e1f52,
+        type: 2}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 224198081419304548, guid: 4b27b1fc0c9780a4492f68549d3e1f52,
+        type: 2}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 224198081419304548, guid: 4b27b1fc0c9780a4492f68549d3e1f52,
+        type: 2}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 224198081419304548, guid: 4b27b1fc0c9780a4492f68549d3e1f52,
+        type: 2}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 224198081419304548, guid: 4b27b1fc0c9780a4492f68549d3e1f52,
+        type: 2}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 224198081419304548, guid: 4b27b1fc0c9780a4492f68549d3e1f52,
+        type: 2}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 224198081419304548, guid: 4b27b1fc0c9780a4492f68549d3e1f52,
+        type: 2}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 224198081419304548, guid: 4b27b1fc0c9780a4492f68549d3e1f52,
+        type: 2}
+      propertyPath: m_RootOrder
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 224198081419304548, guid: 4b27b1fc0c9780a4492f68549d3e1f52,
+        type: 2}
+      propertyPath: m_AnchoredPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 224198081419304548, guid: 4b27b1fc0c9780a4492f68549d3e1f52,
+        type: 2}
+      propertyPath: m_AnchoredPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 224198081419304548, guid: 4b27b1fc0c9780a4492f68549d3e1f52,
+        type: 2}
+      propertyPath: m_SizeDelta.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 224198081419304548, guid: 4b27b1fc0c9780a4492f68549d3e1f52,
+        type: 2}
+      propertyPath: m_SizeDelta.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 224198081419304548, guid: 4b27b1fc0c9780a4492f68549d3e1f52,
+        type: 2}
+      propertyPath: m_AnchorMin.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 224198081419304548, guid: 4b27b1fc0c9780a4492f68549d3e1f52,
+        type: 2}
+      propertyPath: m_AnchorMin.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 224198081419304548, guid: 4b27b1fc0c9780a4492f68549d3e1f52,
+        type: 2}
+      propertyPath: m_AnchorMax.x
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 224198081419304548, guid: 4b27b1fc0c9780a4492f68549d3e1f52,
+        type: 2}
+      propertyPath: m_AnchorMax.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 224198081419304548, guid: 4b27b1fc0c9780a4492f68549d3e1f52,
+        type: 2}
+      propertyPath: m_Pivot.x
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 224198081419304548, guid: 4b27b1fc0c9780a4492f68549d3e1f52,
+        type: 2}
+      propertyPath: m_Pivot.y
+      value: 0.5
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+  m_ParentPrefab: {fileID: 100100000, guid: 4b27b1fc0c9780a4492f68549d3e1f52, type: 2}
+  m_IsPrefabParent: 0
 --- !u!1 &1218118077
 GameObject:
   m_ObjectHideFlags: 0
@@ -418,107 +518,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: d995bd93e747b4143812c28df116ed09, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
---- !u!1001 &1669305093
-Prefab:
-  m_ObjectHideFlags: 0
-  serializedVersion: 2
-  m_Modification:
-    m_TransformParent: {fileID: 1684546291}
-    m_Modifications:
-    - target: {fileID: 224734146220428892, guid: a4b5aa0c4d6c73d4ab0a614e634d1f17,
-        type: 2}
-      propertyPath: m_LocalPosition.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 224734146220428892, guid: a4b5aa0c4d6c73d4ab0a614e634d1f17,
-        type: 2}
-      propertyPath: m_LocalPosition.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 224734146220428892, guid: a4b5aa0c4d6c73d4ab0a614e634d1f17,
-        type: 2}
-      propertyPath: m_LocalPosition.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 224734146220428892, guid: a4b5aa0c4d6c73d4ab0a614e634d1f17,
-        type: 2}
-      propertyPath: m_LocalRotation.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 224734146220428892, guid: a4b5aa0c4d6c73d4ab0a614e634d1f17,
-        type: 2}
-      propertyPath: m_LocalRotation.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 224734146220428892, guid: a4b5aa0c4d6c73d4ab0a614e634d1f17,
-        type: 2}
-      propertyPath: m_LocalRotation.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 224734146220428892, guid: a4b5aa0c4d6c73d4ab0a614e634d1f17,
-        type: 2}
-      propertyPath: m_LocalRotation.w
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 224734146220428892, guid: a4b5aa0c4d6c73d4ab0a614e634d1f17,
-        type: 2}
-      propertyPath: m_RootOrder
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 224734146220428892, guid: a4b5aa0c4d6c73d4ab0a614e634d1f17,
-        type: 2}
-      propertyPath: m_AnchoredPosition.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 224734146220428892, guid: a4b5aa0c4d6c73d4ab0a614e634d1f17,
-        type: 2}
-      propertyPath: m_AnchoredPosition.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 224734146220428892, guid: a4b5aa0c4d6c73d4ab0a614e634d1f17,
-        type: 2}
-      propertyPath: m_SizeDelta.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 224734146220428892, guid: a4b5aa0c4d6c73d4ab0a614e634d1f17,
-        type: 2}
-      propertyPath: m_SizeDelta.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 224734146220428892, guid: a4b5aa0c4d6c73d4ab0a614e634d1f17,
-        type: 2}
-      propertyPath: m_AnchorMin.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 224734146220428892, guid: a4b5aa0c4d6c73d4ab0a614e634d1f17,
-        type: 2}
-      propertyPath: m_AnchorMin.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 224734146220428892, guid: a4b5aa0c4d6c73d4ab0a614e634d1f17,
-        type: 2}
-      propertyPath: m_AnchorMax.x
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 224734146220428892, guid: a4b5aa0c4d6c73d4ab0a614e634d1f17,
-        type: 2}
-      propertyPath: m_AnchorMax.y
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 224734146220428892, guid: a4b5aa0c4d6c73d4ab0a614e634d1f17,
-        type: 2}
-      propertyPath: m_Pivot.x
-      value: 0.5
-      objectReference: {fileID: 0}
-    - target: {fileID: 224734146220428892, guid: a4b5aa0c4d6c73d4ab0a614e634d1f17,
-        type: 2}
-      propertyPath: m_Pivot.y
-      value: 0.5
-      objectReference: {fileID: 0}
-    m_RemovedComponents: []
-  m_ParentPrefab: {fileID: 100100000, guid: a4b5aa0c4d6c73d4ab0a614e634d1f17, type: 2}
-  m_IsPrefabParent: 0
---- !u!1001 &1684546290
+--- !u!1001 &1678569581
 Prefab:
   m_ObjectHideFlags: 0
   serializedVersion: 2
@@ -622,11 +622,11 @@ Prefab:
     m_RemovedComponents: []
   m_ParentPrefab: {fileID: 100100000, guid: 8647d80b558fa724a84d05f9e6aee9bc, type: 2}
   m_IsPrefabParent: 0
---- !u!224 &1684546291 stripped
+--- !u!224 &1678569582 stripped
 RectTransform:
   m_PrefabParentObject: {fileID: 224229560457679016, guid: 8647d80b558fa724a84d05f9e6aee9bc,
     type: 2}
-  m_PrefabInternal: {fileID: 1684546290}
+  m_PrefabInternal: {fileID: 1678569581}
 --- !u!1 &1833966243
 GameObject:
   m_ObjectHideFlags: 0
@@ -670,3 +670,103 @@ Transform:
   m_Father: {fileID: 0}
   m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1001 &2018665164
+Prefab:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 1678569582}
+    m_Modifications:
+    - target: {fileID: 224734146220428892, guid: a4b5aa0c4d6c73d4ab0a614e634d1f17,
+        type: 2}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 224734146220428892, guid: a4b5aa0c4d6c73d4ab0a614e634d1f17,
+        type: 2}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 224734146220428892, guid: a4b5aa0c4d6c73d4ab0a614e634d1f17,
+        type: 2}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 224734146220428892, guid: a4b5aa0c4d6c73d4ab0a614e634d1f17,
+        type: 2}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 224734146220428892, guid: a4b5aa0c4d6c73d4ab0a614e634d1f17,
+        type: 2}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 224734146220428892, guid: a4b5aa0c4d6c73d4ab0a614e634d1f17,
+        type: 2}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 224734146220428892, guid: a4b5aa0c4d6c73d4ab0a614e634d1f17,
+        type: 2}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 224734146220428892, guid: a4b5aa0c4d6c73d4ab0a614e634d1f17,
+        type: 2}
+      propertyPath: m_RootOrder
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 224734146220428892, guid: a4b5aa0c4d6c73d4ab0a614e634d1f17,
+        type: 2}
+      propertyPath: m_AnchoredPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 224734146220428892, guid: a4b5aa0c4d6c73d4ab0a614e634d1f17,
+        type: 2}
+      propertyPath: m_AnchoredPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 224734146220428892, guid: a4b5aa0c4d6c73d4ab0a614e634d1f17,
+        type: 2}
+      propertyPath: m_SizeDelta.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 224734146220428892, guid: a4b5aa0c4d6c73d4ab0a614e634d1f17,
+        type: 2}
+      propertyPath: m_SizeDelta.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 224734146220428892, guid: a4b5aa0c4d6c73d4ab0a614e634d1f17,
+        type: 2}
+      propertyPath: m_AnchorMin.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 224734146220428892, guid: a4b5aa0c4d6c73d4ab0a614e634d1f17,
+        type: 2}
+      propertyPath: m_AnchorMin.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 224734146220428892, guid: a4b5aa0c4d6c73d4ab0a614e634d1f17,
+        type: 2}
+      propertyPath: m_AnchorMax.x
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 224734146220428892, guid: a4b5aa0c4d6c73d4ab0a614e634d1f17,
+        type: 2}
+      propertyPath: m_AnchorMax.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 224734146220428892, guid: a4b5aa0c4d6c73d4ab0a614e634d1f17,
+        type: 2}
+      propertyPath: m_Pivot.x
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 224734146220428892, guid: a4b5aa0c4d6c73d4ab0a614e634d1f17,
+        type: 2}
+      propertyPath: m_Pivot.y
+      value: 0.5
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+  m_ParentPrefab: {fileID: 100100000, guid: a4b5aa0c4d6c73d4ab0a614e634d1f17, type: 2}
+  m_IsPrefabParent: 0

+ 1 - 1
Assets/Resource/Prefab/Object/PlazaRoom.prefab

@@ -319,7 +319,7 @@ Transform:
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 1119007241679598}
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: -9.48, y: -2.8023431, z: -6.705}
+  m_LocalPosition: {x: 0.5, y: -2.7, z: -7.639915}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 4518027564363394}

+ 77 - 9
Assets/Resource/Prefab/PrefabUI/GroupA.prefab

@@ -881,6 +881,21 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
+--- !u!1 &1383153195302856
+GameObject:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  serializedVersion: 5
+  m_Component:
+  - component: {fileID: 224553658927342616}
+  m_Layer: 5
+  m_Name: C_NotifyRarent
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
 --- !u!1 &1394216354908500
 GameObject:
   m_ObjectHideFlags: 1
@@ -2028,6 +2043,21 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
+--- !u!1 &1757898351174316
+GameObject:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  serializedVersion: 5
+  m_Component:
+  - component: {fileID: 224562216929860282}
+  m_Layer: 5
+  m_Name: C_RankRarent
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
 --- !u!1 &1758821326908514
 GameObject:
   m_ObjectHideFlags: 1
@@ -9522,10 +9552,10 @@ RectTransform:
   m_GameObject: {fileID: 1565225231317410}
   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_LocalScale: {x: 0, y: 0, z: 0}
   m_Children: []
-  m_Father: {fileID: 224476342221405536}
-  m_RootOrder: 3
+  m_Father: {fileID: 224562216929860282}
+  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}
@@ -9667,12 +9697,12 @@ RectTransform:
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 1297096319896170}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_LocalScale: {x: 0, y: 0, z: 0}
   m_Children: []
-  m_Father: {fileID: 224476342221405536}
-  m_RootOrder: 4
+  m_Father: {fileID: 224553658927342616}
+  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}
@@ -10245,8 +10275,8 @@ RectTransform:
   - {fileID: 224166385692002180}
   - {fileID: 224143706629484300}
   - {fileID: 224517132005796266}
-  - {fileID: 224270387276606410}
-  - {fileID: 224327389779206034}
+  - {fileID: 224562216929860282}
+  - {fileID: 224553658927342616}
   - {fileID: 224422329702985050}
   m_Father: {fileID: 224577567281555198}
   m_RootOrder: 1
@@ -10482,6 +10512,44 @@ RectTransform:
   m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
+--- !u!224 &224553658927342616
+RectTransform:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1383153195302856}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 0, y: 0, z: 0}
+  m_Children:
+  - {fileID: 224327389779206034}
+  m_Father: {fileID: 224476342221405536}
+  m_RootOrder: 4
+  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: -160.25, y: 0.099998474}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!224 &224562216929860282
+RectTransform:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1757898351174316}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 0, y: 0, z: 0}
+  m_Children:
+  - {fileID: 224270387276606410}
+  m_Father: {fileID: 224476342221405536}
+  m_RootOrder: 3
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 46.100006, y: 46.1}
+  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!224 &224565104257182798
 RectTransform:
   m_ObjectHideFlags: 1

+ 45 - 11
Assets/Resource/Prefab/PrefabUI/GroupD.prefab

@@ -2739,6 +2739,21 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
+--- !u!1 &1888975181721452
+GameObject:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  serializedVersion: 5
+  m_Component:
+  - component: {fileID: 224844895396293946}
+  m_Layer: 5
+  m_Name: X_InfoParent
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
 --- !u!1 &1890430267486372
 GameObject:
   m_ObjectHideFlags: 1
@@ -10850,7 +10865,7 @@ RectTransform:
   - {fileID: 224498666683038304}
   - {fileID: 224163003937850820}
   m_Father: {fileID: 224435399685520028}
-  m_RootOrder: 5
+  m_RootOrder: 4
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
@@ -10906,7 +10921,7 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 224435399685520028}
-  m_RootOrder: 6
+  m_RootOrder: 5
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 1, y: 0}
   m_AnchorMax: {x: 1, y: 0}
@@ -11230,7 +11245,7 @@ RectTransform:
   m_Children:
   - {fileID: 224554810094140982}
   m_Father: {fileID: 224435399685520028}
-  m_RootOrder: 3
+  m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
@@ -11789,7 +11804,7 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 224435399685520028}
-  m_RootOrder: 4
+  m_RootOrder: 3
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
@@ -12138,8 +12153,7 @@ RectTransform:
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
-  - {fileID: 224470330467200464}
-  - {fileID: 224556655023554496}
+  - {fileID: 224844895396293946}
   - {fileID: 224564293462792210}
   - {fileID: 224163097047006416}
   - {fileID: 224335086154216376}
@@ -12295,13 +12309,13 @@ RectTransform:
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 1009134439996232}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 0.5, y: 0.5, z: 1}
   m_Children:
   - {fileID: 224894474809591712}
   - {fileID: 224928330935608942}
-  m_Father: {fileID: 224435399685520028}
+  m_Father: {fileID: 224844895396293946}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
@@ -12565,11 +12579,11 @@ RectTransform:
   m_GameObject: {fileID: 1014192725348854}
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 0.3, y: 0.3, z: 0.99999994}
+  m_LocalScale: {x: 0.29999998, y: 0.29999998, z: 1}
   m_Children:
   - {fileID: 224644221144065818}
   - {fileID: 224215285722539808}
-  m_Father: {fileID: 224435399685520028}
+  m_Father: {fileID: 224844895396293946}
   m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
@@ -12629,7 +12643,7 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 224435399685520028}
-  m_RootOrder: 2
+  m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
@@ -13510,6 +13524,26 @@ RectTransform:
   m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
+--- !u!224 &224844895396293946
+RectTransform:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1888975181721452}
+  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: 224470330467200464}
+  - {fileID: 224556655023554496}
+  m_Father: {fileID: 224435399685520028}
+  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 &224847814436123234
 RectTransform:
   m_ObjectHideFlags: 1

+ 4 - 1
Assets/Resource/XML/Config/plaza_room_config.xml

@@ -1,5 +1,5 @@
 <data>
-  <item id="1" create_cost_fml="h*p" />
+  <item id="1" create_cost_fml="h*p" cost_value_fml="c*h*p" />
   <comment>
     <id>
 id
@@ -7,5 +7,8 @@ id
     <create_cost_fml>
 创建房间花费公式
 </create_cost_fml>
+    <cost_value_fml>
+房间花费转换为默认宝箱价值
+</cost_value_fml>
   </comment>
 </data>

BIN
Assets/Resource/Xlsx/plaza_room_config.xlsx


+ 18 - 4
Assets/Script/Manage/ManaInfoBox.cs

@@ -22,8 +22,11 @@ public class ManaInfoBox : Regist
             public Text Text;
         }
 
+        #region Config
+
         public int MaxCount;
         public bool Lock;
+        public bool Reverse;
         public float DurationTime;
         public float DurationTimer;
         public string InfoItemName;
@@ -34,9 +37,12 @@ public class ManaInfoBox : Regist
         public CanvasGroup CanvasGroup;
         public VerticalLayoutGroup VerticalLayoutGroup;
 
-        public InfoBox(int maxCount, float duration, string infoItemName, ObjType objType, Transform grid)
+        #endregion
+
+        public InfoBox(int maxCount, float duration, string infoItemName, bool reverse, ObjType objType, Transform grid)
         {
             Grid = grid;
+            Reverse = reverse;
             ObjType = objType;
             DurationTime = duration;
             MaxCount = maxCount;
@@ -94,7 +100,15 @@ public class ManaInfoBox : Regist
             TextPlus text = ManaReso.GetInfoItem(InfoItemName, Grid, ObjType);
             text.ImagePlus.sprite = atlas;
             text.SetParent(Grid);
-            text.rectTransform.SetAsFirstSibling();
+
+            if (Reverse)
+            {
+                text.rectTransform.SetAsLastSibling();
+            }
+            else
+            {
+                text.rectTransform.SetAsFirstSibling();
+            }
 
             if (VerticalLayoutGroup != null)
             {
@@ -138,8 +152,8 @@ public class ManaInfoBox : Regist
 
     public override void RegistValueA()
     {
-        GardenInfoBox = new InfoBox(MaxGardenInfoCount, 45f, "C_InfoItem", ObjType.C_InfoItem,  ManaReso.Get("C_Info"));
-        PlazaRoomInfoBox = new InfoBox(MaxPlazaRoomCount, Mathf.Infinity, "X_InfoItem", ObjType.X_InfoItem, ManaReso.Get("X_Info"));
+        GardenInfoBox = new InfoBox(MaxGardenInfoCount, 45f, "C_InfoItem", true, ObjType.C_InfoItem,  ManaReso.Get("C_Info"));
+        PlazaRoomInfoBox = new InfoBox(MaxPlazaRoomCount, Mathf.Infinity, "X_InfoItem", true, ObjType.X_InfoItem, ManaReso.Get("X_Info"));
     }
 
     public void Update()

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

@@ -3359,14 +3359,14 @@ public class ManaUI : Regist
     {
         ManaReso.SetActive("X_GridBK", true);
         ManaReso.SetActive("X_Mask", true);
-        ManaReso.SetActive("X_CurrentInfo", false);
+        ManaReso.SetActive("X_InfoParent", false);
     }
 
     private static void CloseExpressionGrid()
     {
         ManaReso.SetActive("X_GridBK", false);
         ManaReso.SetActive("X_Mask", false);
-        ManaReso.SetActive("X_CurrentInfo", true);
+        ManaReso.SetActive("X_InfoParent", true);
     }
 
 

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

@@ -66,6 +66,7 @@ public class PlazaRoomMge : Regist
         virtualScrollRect.OnVerticalGreaterEqual1 = PreviousPageGate;
 
         CostFml = ManaData.GetPlazaRoomConfig()[1].Value;
+        ValueFml = ManaData.GetPlazaRoomConfig()[2].Value;
     }
 
     public override void RegistReference()
@@ -377,6 +378,7 @@ public class PlazaRoomMge : Regist
     public static int Duration;
     public static int MaxPlayer;
     public static string CostFml;
+    public static string ValueFml;
     private static Text DurationLab;
     private static Text MaxPlayerLab;
     private static Slider DurationSlider;
@@ -407,7 +409,8 @@ public class PlazaRoomMge : Regist
         ManaReso.Get("AA_Tip").TweenForCG();
         ManaReso.Get<CanvasGroup>("AA_CreatePlazaRoom").interactable = false;
 
-        SFSManager.GardenSmartFox.EventManager.PlazaRoomEvent.CreateRoom(roomName, long.Parse(ManaServer.SerialNumber), Duration, MaxPlayer, Cost);
+        int value = (int) Auxiliary.FmlParse(ValueFml, "c", Cost.ToString(), "p", MaxPlayer.ToString(), "h", Duration.ToString());
+        SFSManager.GardenSmartFox.EventManager.PlazaRoomEvent.CreateRoom(roomName, long.Parse(ManaServer.SerialNumber), Duration, MaxPlayer, value);
     }
 
     public static void OnCreateRoomError()

+ 29 - 12
Assets/Script/Object/PlazaRoomChest.cs

@@ -37,6 +37,7 @@ public class PlazaRoomChest : MonoBehaviour, IPointerClickHandler
     private SpriteRenderer ParentSR;
     private SpriteRenderer ChestSR;
 
+    public static InputField InputField;
     public static PlazaRoomChest CurrentChest;
     public static PlazaRoomChest SystemChest;
 
@@ -87,6 +88,9 @@ public class PlazaRoomChest : MonoBehaviour, IPointerClickHandler
         }
         else
         {
+            inputValue = inputValue.ToLower();
+            inputValue = inputValue.Trim();
+
             if (ChestData.ChestType == ChestType.GuessColor)
             {
                 if (inputValue == AnswerColor)
@@ -135,20 +139,22 @@ public class PlazaRoomChest : MonoBehaviour, IPointerClickHandler
     {
         BaseInit(chestData);
 
-        if (chestData.Owner == long.Parse(ManaServer.SerialNumber))
-        {
-            SetColliders(false);
-            StopAnim();
-        }
-        else
-        {
-            SetColliders(true);
-        }
+        //if (chestData.Owner == long.Parse(ManaServer.SerialNumber))
+        //{
+        //    SetColliders(false);
+        //    StopAnim();
+        //}
+        //else
+        //{
+        //    SetColliders(true);
+        //}
+        SetColliders(true);
 
         if (chestData.ChestType == ChestType.GuessColor)
         {
             AnswerInfo = ManaGarden.FlowerInfoDic.Random();
-            AnswerColor = Language.GetStr("FlowerColor", AnswerInfo.ID);
+            AnswerColor = Language.GetStr("FlowerColor", AnswerInfo.ID).ToLower();
+            Debug.Log(AnswerColor);
         }
     }
 
@@ -165,6 +171,11 @@ public class PlazaRoomChest : MonoBehaviour, IPointerClickHandler
 
     private void BaseInit(ChestData chestData)
     {
+        if (InputField == null)
+        {
+            InputField = ManaReso.Get<InputField>("Y_InputField");
+        }
+
         ChestSR = transform.GetChild(0).GetComponent<SpriteRenderer>();
         if (chestData.ChestType == ChestType.System)
         {
@@ -188,11 +199,11 @@ public class PlazaRoomChest : MonoBehaviour, IPointerClickHandler
         if (tweenRoot != null)
         {
             tweenRoot.InDestination = true;
-            tweenRoot.OnBackwardFinish = () => { ManaReso.Save(gameObject); };
         }
         else
         {
-            ParentSR.CreateTweenSr(0, 1, 0.25f, false, true, Curve.EaseOutQuad, false, true);
+            tweenRoot = ParentSR.CreateTweenSr(0, 1, 0.25f, false, true, Curve.EaseOutQuad, false, true);
+            tweenRoot.OnBackwardFinish = () => { Debug.Log("1"); ManaReso.Save(gameObject); };
         }
 
         tweenRoot = transform.GetTweenScale();
@@ -260,6 +271,9 @@ public class PlazaRoomChest : MonoBehaviour, IPointerClickHandler
                 ManaReso.Get<Image>("Y_RewardIcon").color = Color.white;
                 ManaLan.Add(ManaReso.Get<Text>("Y_Tit"), new LanStr("UI", "Yb_GuessColor"));
                 ManaLan.Add(ManaReso.Get<Text>("Y_Desc"), new LanStr("UI", "Y_GuessColorDesc"));
+
+                InputField.text = "";
+                InputField.characterLimit = 30;
             }
             else
             {
@@ -267,6 +281,9 @@ public class PlazaRoomChest : MonoBehaviour, IPointerClickHandler
                 ManaReso.SetActive("Y_RewardIcon", false);
                 ManaLan.Add(ManaReso.Get<Text>("Y_Tit"), new LanStr("UI", "Yb_GuessNumber"));
                 ManaLan.Add(ManaReso.Get<Text>("Y_Desc"), new LanStr("UI", "Y_GuessNumberDesc"));
+
+                InputField.text = "";
+                InputField.characterLimit = 1;
             }
         }
     }

+ 1 - 0
Assets/Script/SFS/Data/Label.cs

@@ -17,6 +17,7 @@ public class Label
     public static string TargetUserID = "tu";
 
     public static string RoomCost = "rc";
+    public static string ChestValue = "cv";
     public static string RoomName = "rn";
     public static string DatabaseRoomID = "di";
 }

+ 6 - 4
Assets/Script/SFS/Manager/ChestMge.cs

@@ -53,12 +53,13 @@ public class ChestData
         ActivatedTime = DateUtil.GetJavaTime(arg.GetLong(gd_chest.ActivatedTime).ToString());
         ChestType = (ChestType) arg.GetInt(gd_chest.Type);
 
+        Vector3 defaultPosition = DefaultPosition + ChestDepthOffset;
         if (arg.ContainsKey(gd_chest.Position))
         {
             string vectorStr = arg.GetUtfString(gd_chest.Position);
             if (vectorStr == "null")
             {
-                Position = DefaultPosition;
+                Position = defaultPosition;
             }
             else
             {
@@ -67,7 +68,7 @@ public class ChestData
         }
         else
         {
-            Position = DefaultPosition;
+            Position = defaultPosition;
         }
     }
 
@@ -339,6 +340,7 @@ public class ChestMge : Regist
 
     public static void ActivateSystemChest()
     {
+
         if (!SFSManager.GardenSmartFox.PlazaRoomManager.JoinedPlazaRoom)
         {
             return;
@@ -417,7 +419,7 @@ public class ChestMge : Regist
 
         for (int i = 0; i < PlazaRoomChests.Count; i++)
         {
-            if (PlazaRoomChests[i].ChestData.ID == chestID)
+            if (PlazaRoomChests[i].ChestData.ID == chestID && PlazaRoomChests[i].ChestData.ChestType != ChestType.System)
             {
                 PlazaRoomChests[i].RetriveChest();
                 PlazaRoomChests.RemoveAt(i--);
@@ -435,7 +437,7 @@ public class ChestMge : Regist
         if (refund > 0)
         {
             ManaCenter.AddDiamond(refund, StaticsManager.ItemID.获得钻石, StaticsManager.ConsumeModule.RoomChestRefund);
-            ManaInfoBox.Show(InfoCategory.Garden, Language.GetStr("UI", "Y_Refund")+refund, 30);
+            ManaInfoBox.Show(InfoCategory.Garden, Language.GetStr("UI", "Y_Refund")+refund, 10);
         }
     }
 

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

@@ -53,7 +53,7 @@ public class PlazaRoomEvent
         SFSEventManager.GardenSmartFox.AddRequest(parameter, RequestType.Immediate);
     }
 
-    public void CreateRoom(string roomName, long serialNumber, int duration, int maxPlayer, int cost)
+    public void CreateRoom(string roomName, long serialNumber, int duration, int maxPlayer, int value)
     {
         SFSManager.GardenSmartFox.ExecuteAfterCheckConection
         (
@@ -64,7 +64,7 @@ public class PlazaRoomEvent
                 parameter.PutLong(Label.UserID, serialNumber);
                 parameter.PutInt(gd_room.Duration, duration);
                 parameter.PutInt(gd_room.MaxPlayer, maxPlayer);
-                parameter.PutInt(Label.RoomCost, cost);
+                parameter.PutInt(Label.ChestValue, value);
                 parameter.PutInt(Label.CommandID, PlazaRoomReq.CreateRoom.GetHashCode());
                 SFSManager.GardenSmartFox.AddRequest(parameter, RequestType.Immediate);
             },

+ 4 - 6
第三期.txt

@@ -1,13 +1,11 @@
-新界面的语言
-
-宝箱的对象池
+箱子和角色的影子
 
-从存档中移除宝箱ID(普通房间 系统房间)
+系统房间不能领取时提示
 
 
-公式在新的excel里面
+新界面的语言
 
-花的颜色在语言文档里
+从存档中移除宝箱ID(普通房间 系统房间)
 
 
 服务器新旧版存取档是否兼容(如果不兼容 可能无法从第二期切换到第三期)