一些UI的适配和组的列表调整

Assets/Resources/perfabs/gameAreaGroupItem.prefab

@@ -36,7 +36,7 @@ RectTransform:
   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: 120, y: 120}
+  m_SizeDelta: {x: 125, y: 125}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &637148015308226340
 CanvasRenderer:

Assets/Resources/perfabs/gameViewLogic.prefab

@@ -189,8 +189,8 @@ RectTransform:
   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_AnchoredPosition: {x: 0, y: 30}
+  m_SizeDelta: {x: 0, y: 30}
   m_Pivot: {x: 0, y: 1}
 --- !u!222 &6452400347204923587
 CanvasRenderer:
@@ -283,8 +283,6 @@ RectTransform:
   - {fileID: 216671789900275948}
   - {fileID: 7778848243247776032}
   - {fileID: 4207755507653322023}
-  - {fileID: 1976999355571500960}
-  - {fileID: 1682976293997861255}
   - {fileID: 4930126960711289547}
   - {fileID: 4350987738922043080}
   m_Father: {fileID: 0}
@@ -622,18 +620,18 @@ RectTransform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 873009014252909700}
-  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_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 1485139897268310784}
-  m_Father: {fileID: 1633357141748549960}
+  m_Father: {fileID: 7778848243247776032}
   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: -719, y: -1904}
+  m_AnchoredPosition: {x: -175, y: 166}
   m_SizeDelta: {x: 360, y: 81}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &3003945673020399370
@@ -1022,13 +1020,14 @@ RectTransform:
   - {fileID: 5210634824352640152}
   - {fileID: 3345813486746951798}
   - {fileID: 161008593911248317}
+  - {fileID: 1976999355571500960}
   m_Father: {fileID: 1633357141748549960}
   m_RootOrder: -1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 1, y: 0}
-  m_AnchoredPosition: {x: 4, y: 840}
-  m_SizeDelta: {x: 0, y: 25}
+  m_AnchorMin: {x: 0.5, y: 0}
+  m_AnchorMax: {x: 0.5, y: 0}
+  m_AnchoredPosition: {x: 0, y: 348}
+  m_SizeDelta: {x: 750, y: 25}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &1036549963076789408
 MonoBehaviour:
@@ -1112,13 +1111,14 @@ RectTransform:
   m_Children:
   - {fileID: 5446485606855009903}
   - {fileID: 3916702469807618879}
+  - {fileID: 832333741895004512}
   m_Father: {fileID: 1633357141748549960}
   m_RootOrder: -1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 1}
-  m_AnchorMax: {x: 1, y: 1}
+  m_AnchorMin: {x: 0.5, y: 1}
+  m_AnchorMax: {x: 0.5, y: 1}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: -630, y: 0}
+  m_SizeDelta: {x: 120, y: 0}
   m_Pivot: {x: 0.5, y: 1}
 --- !u!114 &3648909924624081883
 MonoBehaviour:
@@ -1382,6 +1382,140 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
+--- !u!1 &3080420821459013476
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 832333741895004512}
+  - component: {fileID: 2435598830669844101}
+  - component: {fileID: 1674358342569644079}
+  - component: {fileID: 6173381365454465283}
+  m_Layer: 0
+  m_Name: autoFill
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &832333741895004512
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3080420821459013476}
+  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_ConstrainProportionsScale: 0
+  m_Children:
+  - {fileID: 116011431095675892}
+  m_Father: {fileID: 3684281432546734940}
+  m_RootOrder: -1
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 243.5, y: -126}
+  m_SizeDelta: {x: 87, y: 91}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &2435598830669844101
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3080420821459013476}
+  m_CullTransparentMesh: 1
+--- !u!114 &1674358342569644079
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3080420821459013476}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 21300000, guid: c24d2a60900d07146b57d3a3082bb957, type: 3}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+--- !u!114 &6173381365454465283
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3080420821459013476}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Navigation:
+    m_Mode: 3
+    m_WrapAround: 0
+    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_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
+    m_ColorMultiplier: 1
+    m_FadeDuration: 0.1
+  m_SpriteState:
+    m_HighlightedSprite: {fileID: 0}
+    m_PressedSprite: {fileID: 0}
+    m_SelectedSprite: {fileID: 0}
+    m_DisabledSprite: {fileID: 0}
+  m_AnimationTriggers:
+    m_NormalTrigger: Normal
+    m_HighlightedTrigger: Highlighted
+    m_PressedTrigger: Pressed
+    m_SelectedTrigger: Selected
+    m_DisabledTrigger: Disabled
+  m_Interactable: 1
+  m_TargetGraphic: {fileID: 1674358342569644079}
+  m_OnClick:
+    m_PersistentCalls:
+      m_Calls:
+      - m_Target: {fileID: 8910723590317234935}
+        m_TargetAssemblyTypeName: mainGameScaleMove, Assembly-CSharp
+        m_MethodName: onAutoFillHander
+        m_Mode: 1
+        m_Arguments:
+          m_ObjectArgument: {fileID: 0}
+          m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
+          m_IntArgument: 0
+          m_FloatArgument: 0
+          m_StringArgument: 
+          m_BoolArgument: 0
+        m_CallState: 1
 --- !u!1 &3215813452662575037
 GameObject:
   m_ObjectHideFlags: 0
@@ -1399,7 +1533,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!224 &548037199292223520
 RectTransform:
   m_ObjectHideFlags: 0
@@ -1493,9 +1627,9 @@ RectTransform:
   m_Father: {fileID: 3684281432546734940}
   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: 825, y: -30}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 885, y: -126}
   m_SizeDelta: {x: 200, y: 50}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &1506329684643559557
@@ -1721,18 +1855,18 @@ RectTransform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 4047933918126060582}
-  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_ConstrainProportionsScale: 0
   m_Children: []
-  m_Father: {fileID: 1633357141748549960}
+  m_Father: {fileID: 4207755507653322023}
   m_RootOrder: -1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 1, y: 0}
-  m_AnchoredPosition: {x: 4, y: 821.4}
-  m_SizeDelta: {x: 0, y: 25}
+  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: 750, y: 25}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &2831736868530311398
 CanvasRenderer:
@@ -2575,6 +2709,82 @@ MonoBehaviour:
           m_StringArgument: 
           m_BoolArgument: 0
         m_CallState: 2
+--- !u!1 &5853481637200319250
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 116011431095675892}
+  - component: {fileID: 6861346871259649856}
+  - component: {fileID: 7270151825793149432}
+  m_Layer: 0
+  m_Name: fore
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &116011431095675892
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5853481637200319250}
+  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_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 832333741895004512}
+  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: 0, y: 0}
+  m_SizeDelta: {x: 55, y: 55}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &6861346871259649856
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5853481637200319250}
+  m_CullTransparentMesh: 1
+--- !u!114 &7270151825793149432
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5853481637200319250}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 21300000, guid: b42c4b754bf4ff34d9602087cdab6bf8, type: 3}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
 --- !u!1 &5940396924526109151
 GameObject:
   m_ObjectHideFlags: 0
@@ -2676,6 +2886,7 @@ GameObject:
   - component: {fileID: 5145632994799020238}
   - component: {fileID: 6177109562948806136}
   - component: {fileID: 2276064347271355634}
+  - component: {fileID: 8111164355371235926}
   m_Layer: 0
   m_Name: Content
   m_TagString: Untagged
@@ -2741,6 +2952,30 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
+--- !u!114 &8111164355371235926
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5978997263012059768}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 8a8695521f0d02e499659fee002a26c2, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Padding:
+    m_Left: 5
+    m_Right: 0
+    m_Top: 0
+    m_Bottom: 0
+  m_ChildAlignment: 0
+  m_StartCorner: 0
+  m_StartAxis: 0
+  m_CellSize: {x: 120, y: 120}
+  m_Spacing: {x: 0, y: 0}
+  m_Constraint: 0
+  m_ConstraintCount: 2
 --- !u!1 &6769909122946713645
 GameObject:
   m_ObjectHideFlags: 0
@@ -3317,13 +3552,14 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
+  - {fileID: 1682976293997861255}
   - {fileID: 9072884845680009661}
   m_Father: {fileID: 1633357141748549960}
   m_RootOrder: -1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0}
   m_AnchorMax: {x: 0.5, y: 0}
-  m_AnchoredPosition: {x: 0, y: 170}
+  m_AnchoredPosition: {x: 0, y: 150}
   m_SizeDelta: {x: 750, y: 140}
   m_Pivot: {x: 0.5, y: 0}
 --- !u!222 &660496339158997908
@@ -4133,11 +4369,11 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 6616910588763818716, guid: d22d30a8bc14c794682266b9e458c412, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: -65
+      value: 80
       objectReference: {fileID: 0}
     - target: {fileID: 6616910588763818716, guid: d22d30a8bc14c794682266b9e458c412, type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: -144
+      value: -120
       objectReference: {fileID: 0}
     - target: {fileID: 6616910588763818716, guid: d22d30a8bc14c794682266b9e458c412, type: 3}
       propertyPath: m_LocalEulerAnglesHint.x

Assets/Scenes/gameScene.unity

@@ -414,151 +414,6 @@ Transform:
   m_Father: {fileID: 0}
   m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!114 &1255072239 stripped
-MonoBehaviour:
-  m_CorrespondingSourceObject: {fileID: 8910723590317234935, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3}
-  m_PrefabInstance: {fileID: 1821187684178258737}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 0}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: c3deb1e6e6112304d918d673de43ccc6, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
---- !u!1 &1321381574
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 1321381575}
-  - component: {fileID: 1321381578}
-  - component: {fileID: 1321381577}
-  - component: {fileID: 1321381576}
-  m_Layer: 0
-  m_Name: autoFill
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!224 &1321381575
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1321381574}
-  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_ConstrainProportionsScale: 0
-  m_Children:
-  - {fileID: 2084939617}
-  m_Father: {fileID: 1821187684178258742}
-  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: 183.5, y: -1355.9}
-  m_SizeDelta: {x: 87, y: 91}
-  m_Pivot: {x: 0.5, y: 0.5}
---- !u!114 &1321381576
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1321381574}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_Navigation:
-    m_Mode: 3
-    m_WrapAround: 0
-    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_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
-    m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
-    m_ColorMultiplier: 1
-    m_FadeDuration: 0.1
-  m_SpriteState:
-    m_HighlightedSprite: {fileID: 0}
-    m_PressedSprite: {fileID: 0}
-    m_SelectedSprite: {fileID: 0}
-    m_DisabledSprite: {fileID: 0}
-  m_AnimationTriggers:
-    m_NormalTrigger: Normal
-    m_HighlightedTrigger: Highlighted
-    m_PressedTrigger: Pressed
-    m_SelectedTrigger: Selected
-    m_DisabledTrigger: Disabled
-  m_Interactable: 1
-  m_TargetGraphic: {fileID: 1321381577}
-  m_OnClick:
-    m_PersistentCalls:
-      m_Calls:
-      - m_Target: {fileID: 1255072239}
-        m_TargetAssemblyTypeName: mainGameScaleMove, Assembly-CSharp
-        m_MethodName: onAutoFillHander
-        m_Mode: 1
-        m_Arguments:
-          m_ObjectArgument: {fileID: 0}
-          m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
-          m_IntArgument: 0
-          m_FloatArgument: 0
-          m_StringArgument: 
-          m_BoolArgument: 0
-        m_CallState: 1
---- !u!114 &1321381577
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1321381574}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 1, b: 1, a: 1}
-  m_RaycastTarget: 1
-  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
-  m_Maskable: 1
-  m_OnCullStateChanged:
-    m_PersistentCalls:
-      m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: c24d2a60900d07146b57d3a3082bb957, type: 3}
-  m_Type: 0
-  m_PreserveAspect: 0
-  m_FillCenter: 1
-  m_FillMethod: 4
-  m_FillAmount: 1
-  m_FillClockwise: 1
-  m_FillOrigin: 0
-  m_UseSpriteMesh: 0
-  m_PixelsPerUnitMultiplier: 1
---- !u!222 &1321381578
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1321381574}
-  m_CullTransparentMesh: 1
 --- !u!1 &1329740667
 GameObject:
   m_ObjectHideFlags: 0
@@ -792,82 +647,6 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1864366138}
   m_CullTransparentMesh: 1
---- !u!1 &2084939616
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 2084939617}
-  - component: {fileID: 2084939619}
-  - component: {fileID: 2084939618}
-  m_Layer: 0
-  m_Name: fore
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!224 &2084939617
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2084939616}
-  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_ConstrainProportionsScale: 0
-  m_Children: []
-  m_Father: {fileID: 1321381575}
-  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: 0, y: 0}
-  m_SizeDelta: {x: 55, y: 55}
-  m_Pivot: {x: 0.5, y: 0.5}
---- !u!114 &2084939618
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2084939616}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 1, b: 1, a: 1}
-  m_RaycastTarget: 1
-  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
-  m_Maskable: 1
-  m_OnCullStateChanged:
-    m_PersistentCalls:
-      m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: b42c4b754bf4ff34d9602087cdab6bf8, type: 3}
-  m_Type: 0
-  m_PreserveAspect: 0
-  m_FillCenter: 1
-  m_FillMethod: 4
-  m_FillAmount: 1
-  m_FillClockwise: 1
-  m_FillOrigin: 0
-  m_UseSpriteMesh: 0
-  m_PixelsPerUnitMultiplier: 1
---- !u!222 &2084939619
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2084939616}
-  m_CullTransparentMesh: 1
 --- !u!1001 &1821187684178258737
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -1026,27 +805,31 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 548037199292223520, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3}
       propertyPath: m_AnchorMax.x
-      value: 0.5
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 548037199292223520, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3}
       propertyPath: m_AnchorMax.y
-      value: 0.5
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 548037199292223520, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3}
       propertyPath: m_AnchorMin.x
-      value: 0.5
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 548037199292223520, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3}
       propertyPath: m_AnchorMin.y
-      value: 0.5
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 548037199292223520, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3}
       propertyPath: m_SizeDelta.x
-      value: 750
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 548037199292223520, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3}
       propertyPath: m_SizeDelta.y
-      value: 1624
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 548037199292223520, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 579534837900412603, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3}
       propertyPath: m_Color.b
@@ -1084,6 +867,14 @@ PrefabInstance:
       propertyPath: m_Value
       value: 1
       objectReference: {fileID: 0}
+    - target: {fileID: 832333741895004512, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 560
+      objectReference: {fileID: 0}
+    - target: {fileID: 832333741895004512, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: -120
+      objectReference: {fileID: 0}
     - target: {fileID: 873009014252909700, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3}
       propertyPath: m_IsActive
       value: 1
@@ -1112,6 +903,10 @@ PrefabInstance:
       propertyPath: m_Value
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 1036549963076789408, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3}
+      propertyPath: m_Interactable
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 1194477751654865661, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3}
       propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.size
       value: 0
@@ -1246,11 +1041,11 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 1682976293997861255, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: -186
+      value: -175
       objectReference: {fileID: 0}
     - target: {fileID: 1682976293997861255, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: -420
+      value: 166
       objectReference: {fileID: 0}
     - target: {fileID: 1768046760152476349, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3}
       propertyPath: m_IsActive
@@ -1294,11 +1089,11 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 1976999355571500960, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 2.7999878
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 1976999355571500960, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: -509
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 2087345114315532017, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3}
       propertyPath: m_IsActive
@@ -1538,7 +1333,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 3684281432546734940, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3}
       propertyPath: m_AnchorMax.y
-      value: 0.5
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 3684281432546734940, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3}
       propertyPath: m_AnchorMin.x
@@ -1546,7 +1341,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 3684281432546734940, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3}
       propertyPath: m_AnchorMin.y
-      value: 0.5
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 3684281432546734940, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3}
       propertyPath: m_SizeDelta.x
@@ -1562,7 +1357,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 3684281432546734940, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: 2041.5
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 3897279381017416766, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3}
       propertyPath: m_AnchorMax.y
@@ -1586,11 +1381,11 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 3916702469807618879, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 298.1
+      value: 660
       objectReference: {fileID: 0}
     - target: {fileID: 3916702469807618879, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: -1355.9
+      value: -120
       objectReference: {fileID: 0}
     - target: {fileID: 3919367363602599034, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3}
       propertyPath: m_IsActive
@@ -1638,7 +1433,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 4207755507653322023, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3}
       propertyPath: m_AnchorMax.y
-      value: 0.5
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 4207755507653322023, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3}
       propertyPath: m_AnchorMin.x
@@ -1646,7 +1441,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 4207755507653322023, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3}
       propertyPath: m_AnchorMin.y
-      value: 0.5
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 4207755507653322023, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3}
       propertyPath: m_SizeDelta.x
@@ -1658,7 +1453,35 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 4207755507653322023, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: -485
+      value: 348
+      objectReference: {fileID: 0}
+    - target: {fileID: 4231459619420674691, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3}
+      propertyPath: m_Color.a
+      value: 0.38431373
+      objectReference: {fileID: 0}
+    - target: {fileID: 4350987738922043080, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3}
+      propertyPath: m_AnchorMax.x
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 4350987738922043080, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 4350987738922043080, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3}
+      propertyPath: m_AnchorMin.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4350987738922043080, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4350987738922043080, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3}
+      propertyPath: m_SizeDelta.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4350987738922043080, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3}
+      propertyPath: m_SizeDelta.y
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 4886643278448710515, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3}
       propertyPath: itemWidth
@@ -1750,19 +1573,19 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 5446485606855009903, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3}
       propertyPath: m_AnchorMax.x
-      value: 0.5
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 5446485606855009903, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3}
       propertyPath: m_AnchorMax.y
-      value: 0.5
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 5446485606855009903, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3}
       propertyPath: m_AnchorMin.x
-      value: 0.5
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 5446485606855009903, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3}
       propertyPath: m_AnchorMin.y
-      value: 0.5
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 5446485606855009903, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3}
       propertyPath: m_SizeDelta.x
@@ -1774,11 +1597,11 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 5446485606855009903, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: -303.7
+      value: 80
       objectReference: {fileID: 0}
     - target: {fileID: 5446485606855009903, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: -1357
+      value: -120
       objectReference: {fileID: 0}
     - target: {fileID: 5446485606855009903, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3}
       propertyPath: m_ConstrainProportionsScale
@@ -2154,9 +1977,6 @@ PrefabInstance:
     m_RemovedGameObjects:
     - {fileID: 7579613037584348143, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3}
     m_AddedGameObjects:
-    - targetCorrespondingSourceObject: {fileID: 3684281432546734940, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3}
-      insertIndex: -1
-      addedObject: {fileID: 1321381575}
     - targetCorrespondingSourceObject: {fileID: 3916702469807618879, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3}
       insertIndex: -1
       addedObject: {fileID: 1864366139}
@@ -2209,8 +2029,3 @@ RectTransform:
   m_CorrespondingSourceObject: {fileID: 3916702469807618879, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3}
   m_PrefabInstance: {fileID: 1821187684178258737}
   m_PrefabAsset: {fileID: 0}
---- !u!224 &1821187684178258742 stripped
-RectTransform:
-  m_CorrespondingSourceObject: {fileID: 3684281432546734940, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3}
-  m_PrefabInstance: {fileID: 1821187684178258737}
-  m_PrefabAsset: {fileID: 0}

Assets/scripts/Views/gameScene/gameSceneAreaGroupHandler.cs

@@ -27,8 +27,19 @@ public class gameSceneAreaGroupHandler : gridView
     {
         RectTransform rectTransform = transform.parent.Find("bg").GetComponent<RectTransform>();
         utilsTools.DisplaySize = new Vector2(rectTransform.rect.width,rectTransform.rect.height);
+        
     }
 
+    public void SetChild_ListPosData()
+    {
+        var content = transform.GetComponent<ScrollRect>().content;
+
+        content.GetComponent<GridLayoutGroup>().enabled = false;
+        for (int i = 0; i < content.childCount; i++)
+        {
+            content.GetChild(i).GetComponent<colorItem>().SetLocalRootPos();
+        }
+    }
     // Update is called once per frame
     void Update(){
     }

Assets/scripts/Views/gameScene/gameSceneLogic.cs

@@ -70,16 +70,17 @@ public class gameSceneLogic : MonoBehaviour, IEventHandler
         onEvent("gamePlayerEndHandler", onGamePlayerEndHandlerEvent); //整个大图都涂完了
         onEvent("closeGameScene", onCloseGameSceneEvent); //关游戏
         onEvent("removeGroupByGid", onRemoveGroupByGidEvent); //自动涂gid不一致会调过来
+        onEvent("GroupIsLoadOver", onGroupIsLoadOver); //组的成员加载完成
         transform.Find("ingameLoad/loadImg").gameObject.SetActive(false);  
         //gameScenUser
         var gridViewList = areaGroupList.GetComponent<gameSceneAreaGroupHandler>();
         gridViewList.gameObject.SetActive(false);
         transform.Find("groupListBg").gameObject.SetActive(false);
-        transform.Find("gameProgressText").gameObject.SetActive(false);
+        transform.Find("gameProgress/gameProgressText").gameObject.SetActive(false);
         transform.Find("gameProgress").gameObject.SetActive(false);
         transform.Find("gameEndOperBase").gameObject.SetActive(false);
         transform.Find("gameEndOperBase").GetComponent<gameEndLogic>().initMember();
-        transform.Find("tipSelectGroup").gameObject.SetActive(false);
+        transform.Find("areaGroupList/tipSelectGroup").gameObject.SetActive(false);
         transform.Find("top").gameObject.SetActive(false);
         utilsTools.setGDataByKey("PhoneOffsetValue", 50);
         utilsTools.addTimer_Sec(gameObject, "loopGetHot", (String name) =>
@@ -91,11 +92,21 @@ public class gameSceneLogic : MonoBehaviour, IEventHandler
             addHotParams<int>("TUSE_PhoneOffsetValue", "PhoneOffsetValue", int.TryParse);
             return true;
         }, 3, 0);
-        utilsTools.resetGameObjectTreeSize(gameObject, (String path) =>
+        //utilsTools.resetGameObjectTreeSize(gameObject, (String path) =>
+        //{
+        //    if (path.IndexOf("/top/") > 0) return 1;
+        //    return 0;
+        //});
+    }
+
+    private void onGroupIsLoadOver(List<UnityEngine.Object> uobjects, List<object> objects)
     {
-            if (path.IndexOf("/top/") > 0) return 1;
-            return 0;
-        });
+        StartCoroutine(TestDelay());
+    }
+    IEnumerator TestDelay()
+    {
+        yield return new WaitForSeconds(0.5f);
+        areaGroupList.GetComponent<gameSceneAreaGroupHandler>().SetChild_ListPosData();
     }
 
     void addHotParams<T>(string netKey,string localKey, StringOutTValue<T> back, NotifyBoolParam notifyBoolParam = null)
@@ -183,7 +194,7 @@ public class gameSceneLogic : MonoBehaviour, IEventHandler
             item = gridViewList.getObjectById(nowidx).GetComponent<colorItem>();
             item.IsSelect = false;
             item.transform.GetLocalPositionAndRotation(out vector3, out quaternion);
-            vector3.y = vector3.y - 14;
+            //vector3.y = vector3.y - 14;
             item.transform.SetLocalPositionAndRotation(vector3, quaternion);
             item.updateOneUI();
             item.switchPlayAnimation();
@@ -195,15 +206,27 @@ public class gameSceneLogic : MonoBehaviour, IEventHandler
         item = gridViewList.getObjectById(idx).GetComponent<colorItem>();
         item.IsSelect = true;
         item.transform.GetLocalPositionAndRotation(out vector3, out quaternion);
-        vector3.y = vector3.y + 14;
+        //vector3.y = vector3.y + 14;
         item.transform.SetLocalPositionAndRotation(vector3, quaternion);
         item.switchPlayAnimation();
         maingameView.switchShowAreaGroup((short)nowSelectGroupId, (int id, bool isOk) => {
             if (isOk)
             {
-                transform.Find("tipSelectGroup").gameObject.SetActive(false);
+                transform.Find("areaGroupList/tipSelectGroup").gameObject.SetActive(false);
             }
         });
+
+        Transform item_obj;
+        for (int i = 0; i < areaGroupList.transform.GetComponent<ScrollRect>().content.childCount; i++)
+        {
+            if (i == nowidx)
+                continue;
+            item_obj = areaGroupList.transform.GetComponent<ScrollRect>().content.GetChild(i);
+            item_obj.GetComponent<colorItem>().ChangeLocalPos_Select(i < nowidx, nowidx, item.transform.localPosition.x);
+        }
+
+
+
     }
     //游戏图片初始化完成
     private void onEvent_gameViewOnInitEnd_Handler(List<UnityEngine.Object> uobjects, List<System.Object> objects)
@@ -249,13 +272,15 @@ public class gameSceneLogic : MonoBehaviour, IEventHandler
             });
         }
         //RectTransform rectTransform1 = gridViewList.GetComponent<RectTransform>();
-        RectTransform rectTransform2 = transform.Find("tipSelectGroup").GetComponent<RectTransform>();
+        RectTransform rectTransform2 = transform.Find("areaGroupList/tipSelectGroup").GetComponent<RectTransform>();
         if (autoSwitchGroup == false)
         {
             rectTransform2.gameObject.SetActive(true);
             maingameView.GetComponent<mainGameScaleMove>().setCheckInput();
             utilsTools.sendEventObjectParams("inGameLoadingValue", 100f, true);
         }
+        
+
     }
     private bool phoneClickByPos(ref mainGameView mainview, short x, short y, short faulTolerant, bool isFirst)
     {
@@ -335,7 +360,7 @@ public class gameSceneLogic : MonoBehaviour, IEventHandler
         short y = (short)objects[1];
         if(nowidx < 0)
         {
-            transform.Find("tipSelectGroup").gameObject.SetActive(true);
+            transform.Find("areaGroupList/tipSelectGroup").gameObject.SetActive(true);
             return;
         }
         var maingameView = gameShowView.GetComponent<mainGameView>();
@@ -357,7 +382,7 @@ public class gameSceneLogic : MonoBehaviour, IEventHandler
         transform.Find("ingameLoad").gameObject.SetActive(false);
         transform.Find("top").gameObject.SetActive(true);
         utilsTools.setGDataByKey("loadingEnd", utilsTools.getTotalMillisecond());
-        RectTransform transform1 = transform.Find("gameProgressText").GetComponent<RectTransform>();
+        RectTransform transform1 = transform.Find("gameProgress/gameProgressText").GetComponent<RectTransform>();
         transform1.gameObject.SetActive(true);
         transform1 = transform.Find("gameProgress").GetComponent<RectTransform>();
         transform1.gameObject.SetActive(true);
@@ -418,7 +443,7 @@ public class gameSceneLogic : MonoBehaviour, IEventHandler
             Sprite sprite = Sprite.Create(texture2d, new Rect(0, 0, texture2d.width, texture2d.height), new Vector2(0.5f, 0.5f));
             image.sprite = sprite;
             image.color = new Color(1,1,1,1);
-            autoSwitchGroup = Boolean.Parse(utilsTools.getGDataByKey<string>("auto_switch", autoSwitchGroup.ToString()));
+            autoSwitchGroup = true;//Boolean.Parse(utilsTools.getGDataByKey<string>("auto_switch", autoSwitchGroup.ToString()));
             if (autoSwitchGroup == false) nowidx = -1;
             vibration = Boolean.Parse(utilsTools.getGDataByKey<string>("vibration", vibration.ToString()));
             this.handlerLoadingPosition(image);
@@ -533,7 +558,7 @@ public class gameSceneLogic : MonoBehaviour, IEventHandler
     void onChangeGameUserProgressEvent(List<UnityEngine.Object> uobjects,List<System.Object> objects) {
         int pro = (int)objects[0];
         transform.Find("ingameLoad").gameObject.SetActive(false);
-        TextMeshProUGUI textMeshPro = transform.Find("gameProgressText").GetComponent<TextMeshProUGUI>();
+        TextMeshProUGUI textMeshPro = transform.Find("gameProgress/gameProgressText").GetComponent<TextMeshProUGUI>();
         textMeshPro.text = pro.ToString() + "%";
         UnityEngine.UI.Slider slider = transform.Find("gameProgress").GetComponent<UnityEngine.UI.Slider>();
         slider.value = pro;
@@ -575,7 +600,8 @@ public class gameSceneLogic : MonoBehaviour, IEventHandler
         short x = (short)objects[1];
         short y = (short)objects[2];
         short nowAidByGid = gameArea.gid;
-        if (nowAidByGid != nowidx) return;
+        if (groupInfos.Count.Equals(0) || nowidx < 0) return;
+        if (groupInfos[nowidx].gid.Equals(nowAidByGid) == false) return;
         if (groupInfos != null)
         {
             int operId = -1;
@@ -691,6 +717,8 @@ public class gameSceneLogic : MonoBehaviour, IEventHandler
                 Debug.Log(tempJsondata);
             }
             gameShowView.GetComponent<mainGameView>().onClear();
+            int index = utilsTools.getGDataByKey<int>("testIdx", 0);
+            utilsTools.setGDataByKey("testIdx", ++index);
             SceneManager.LoadScene("Scenes/MainGame");
             return false;
         }, 40);

Assets/scripts/Views/maingame/Native.cs

@@ -2,6 +2,7 @@ using Assets.scripts.Datas;
 using System;
 using System.Collections;
 using System.Collections.Generic;
+using System.Linq;
 using UnityEngine;
 using UnityEngine.SceneManagement;
 using UnityEngine.UI;
@@ -63,9 +64,26 @@ public class Native : MonoBehaviour
     }
     void jumpGame(string json)
     {
+        //List<string> testAllNames = new List<string>();
+        //if (utilsTools.ContainsKeyGDataByKey("testAllNames") == false)
+        //{
+        //    testAllNames = "cc--EDgRpc_nHQru7H\r\ncc-b1dW-QP1E-zBltm\r\ncc-cSt4EOqsXK6R_6N\r\ncc-DVgply_IQjVNPwZ\r\ncc-iZISlRR8L2AE3DD\r\ncc-kQgHAvkC09pPAPa\r\ncc-UWdLAPUMAHBfGF4\r\ncc-uZgwyPmeBZy1l-F\r\ncc-vh_KQfU1BGnX3Ir\r\ncc0eAVo-XLi4tvvMzb\r\ncc0jUflz1R7hf6Zav7\r\ncc0mzGQlgK15OtLbJ9\r\ncc0pwJCtz_oyKIWTCq\r\ncc0ZjIuxBvc0xJZygm\r\ncc10YuqeuEgO3Wt-AE\r\ncc14BT5TmKZ_M7TYaD\r\ncc18zm0VA2UVDz4tcS\r\ncc1AklsufZwvB2ZKkz\r\ncc1cSwFsO5HTaNZoFw\r\ncc1m6lVOOZwsDhBE59\r\ncc1teLIfDN_eEpagL2\r\ncc1z6uI2fssufOw6Bb\r\ncc2acpQGGAzRwx4wgf\r\ncc2b2yKWQiOZwxcbN8\r\ncc2cGiMqrL5SCr2_wP\r\ncc2cnMykuRBsWNsukt\r\ncc2D9Z2w9k0evqUiCQ\r\ncc2DkyW7HcdzIMKDw9\r\ncc2peJpLL8sBu4Tadw\r\ncc3703l3T6rn1xqDAH\r\ncc3nOKJINlDbcybtmy\r\ncc3Ucib7Lu5rAu_ddf\r\ncc3W3C7u7UGXjwYQdn\r\ncc475a7MSPQ6yjlYeH\r\ncc4dawGyC2Gza_gRkQ\r\ncc4L6-ygkvYUt8ykZp\r\ncc4LWkebBqeP7FnBWs\r\ncc4V-EuXTPDSQZnF6y\r\ncc4wJu97I2OqJpPS7z\r\ncc4ZBwBNukfFWd_nm5\r\ncc5AEqsbf9_xfvRhEx\r\ncc5C3SDNILHj4I1JCW\r\ncc5CuZCdyW8O9NNONJ\r\ncc5hX51rqnl5njSl0S\r\ncc5lugy-5AoBcr9uFS\r\ncc5mpcFhKktn_TfgJ4\r\ncc5MRTEdZx_YWYxAcy\r\ncc5mXJISDZiTU1kjzH\r\ncc5s3TmJyZ2AxNormC\r\ncc5xlyIrSpU38YOh1M\r\ncc6LMN5WQIv5Sfwn8s\r\ncc6p9vUHS8v68uKv87\r\ncc6qcBEmh4627DNZvt\r\ncc73Lq0jQLtl5JSJge\r\ncc756wDyF1aNqXEcsg\r\ncc7E30PNdgd5dsI5WU\r\ncc7exnD_xFgIIaG19w\r\ncc7I3nLtZ8Z1T8j5RR\r\ncc7IEpE1MjM-dsPRVb\r\ncc7mq7f9qy9lHNmrxG\r\ncc7qhcHw4o3LEStHwn\r\ncc89ct2qXHRH1U8cYI\r\ncc8bVuCy96Vuooh8F6\r\ncc8C7pephPiaT8ERTK\r\ncc8EpLt5YlMOIz3aWe\r\ncc8fIEE2SHZYx7cCv6\r\ncc8IoATO5aNajzP9-9\r\ncc8j7TtTUklVbhsReX\r\ncc8LCdPthBIhSaY0lD\r\ncc8ULZLjTnYSxXokoX\r\ncc8VyFCd3AI_9vZmLA\r\ncc9GuNpAeLmXnnWoht\r\ncc9HWWe2xdO6iYw-wX\r\ncc9LEdAWtrTuc18x4r\r\ncc9TrQZW32Nd-uz7xA\r\nccA1db2RDCPqphc-qB\r\ncca1gJTRIr_dA-IQm9\r\ncca90lUB4DBgWdi693\r\nccAb3MMJYGCByvPvnT\r\nccaGMrBjMOpUe1lvOW\r\nccajl2S28zBLBDhAzX\r\nccak5uv83fgSrmyyu6\r\nccanumw6k2qItZeJEt\r\nccAq2Z81i5Fq7inI_U\r\nccAr5Wc4XqDbKpQcw2\r\nccaRafPp3qmegYx4Pc\r\nccARM6jQgpR2JovpiA\r\nccAwaQ1nvKk6DWfMvq\r\nccb2Oia2Yj0iA6fQy0\r\nccB9gphM_92KANheDs\r\nccbfeXRCKS31mJ5Wbl\r\nccbfM8lKOn6kbOmlei\r\nccBgmcuL6fPyuXzUIy\r\nccBHHOnoteVO38C-OW\r\nccbJQVydDWaY1yEzp4\r\nccbl0q4vr3giuBQzmp\r\nccblJ3NQ65LSmtq_f5\r\nccBLKvtNxpFeKb3Qbw\r\nccbmYvMW-lE2Sa2Ksl\r\nccbQGsxC3ayzAYiNN4\r\nccBU_GNkK-Dl-qLxf2\r\nccbzkF6g6yR9QBDSNx\r\nccc0M2z-0xbLPJg43k\r\nccc3_1L75nTiFOu9TG\r\ncccdL13G0AGnaqqr95\r\nccCEVfpmYtIb6MH4qo\r\ncccM9cfk_gbjF4aTG7\r\nccCMxk_ydBtkVUBlmH\r\ncccOoyAJdnanywIg_z\r\ncccQe7XkFht9CWzQGX\r\ncccrFg9_UiBF8byHui\r\ncccVeiKVT8GnZL6LUv\r\ncccxGRmBYeiaOosgxz\r\nccCZVZSP2mLEnmzvwI\r\nccD-4pdgqlR8A2ZlqX\r\nccd33mmXDuiwsyaHgY\r\nccD4tkrOm5vurD31vU\r\nccD9Oq5x0CJwZzMy2d\r\nccDcEoXYOxEzDQ7cDF\r\nccDDpzLzPWs62vqVYx\r\nccdkflCQWL5uotC9y4\r\nccdlJZ0ecVqSc_UuW2\r\nccdlKKSKce3sm1YX4M\r\nccDoEGkrZjbt_HvNR8\r\nccDOh9WrWOscWMP1N7\r\nccDRAcTZ44A6JIFKOh\r\nccDSOyamN3FVsUFIyE\r\nccDwDrHypXGKaSGgIh\r\nccdX88HyI5KGJRBWMi\r\nccdYANQQofHnqUQykR\r\nccE2CtsdaTs6OALIc2\r\ncce4-zPoQPVFsLSEtO\r\ncceH9HS7-erwzF2WE7\r\nccEH_G3qWYuyLv1DVM\r\ncceJsAw9Lft46nsIF2\r\ncceJ_NGQGxeIxemox_\r\nccekqEz_UM5fnQfeDx\r\ncceM27ajb9AfIZ5tv9\r\nccEmThb2zODQ97aDNC\r\nccEPTnHpJwFvYfcx6d\r\ncceT0re8RlCdLzm7gB\r\nccF36QP_cfdZVbDQ2D\r\nccf703DzfnjsIvuvh1\r\nccf7qUQiRkX5mYhfBb\r\nccfaNLc4eqhrUXANCC\r\nccfb6-OfXmE2GBVPW4\r\nccfhUmMHXU_MBLA7S9\r\nccfniLtzM2UmmVNHkI\r\nccfRaY2m00qBR5xX5F\r\nccfurlvAy5Tf7oWFe8\r\nccFwPmmPvcu0qNNiEh\r\nccG02nB7BSpshiY5us\r\nccGAp6da0Z62pBYMuS\r\nccgCTqoiwmXnQ1RGBb\r\nccGeeShabVQHPqaCjT\r\nccGf6fDnJuAHCvSwj5\r\nccGid9YEGoEzY4dd-I\r\nccgM6a8nEbnrhYONum\r\nccGpV0hJLx3XSaBY4j\r\nccgtiP11zOIJr5JL3c\r\nccH3eNZNJal9dpLdB0\r\nccH6J7djwEf-sLMB7j\r\nccHdRRuTO9SJvmAodK\r\nccHEd08Gak0B-kRXiy\r\ncchIavulv5vw1vqTAY\r\ncchTEQx6BizC-S5eWC\r\nccHv7rm61k5UDflRJf\r\nccHVdXW560AUoyC1fz\r\nccHVkNP3TQbwxiujEt\r\nccHz6262ecZaoEdWjp\r\nccHz8OA8WFtL-ysVYP\r\ncci3E63dIw9JAZUz69\r\nccI5z1JQPbRgsDaCms\r\nccIg0EOsb8c5WuJncq\r\nccIoYoaNWd-FEOXgDI\r\nccip14zu8ROtY6FAyw\r\nccipucAjM2TTnd_abG\r\nccIqf0tNagB6rFf3Cj\r\ncciUE7S3pIp4kQFHz-\r\nccIWHnbmPX7096wR5m\r\nccIYMIpVlmsWWuvHZw\r\nccj-klg-mzYPEKUN6t\r\nccj1yBZp19ExeUvueW\r\nccj61gxqDKgZwJ1J24\r\nccjKUPhFiRU19L8ZSW\r\nccjLvs3vuEPPqjCUhG\r\nccJmJkipsT9Q04dY8_\r\nccjrggxFs93wllUhfc\r\nccJs7fzQBXUNJyPjJ5\r\ncckaOByg3JdjikYszE\r\nccKGzX5g3VmX628zxN\r\ncckhFf-6mkGrbidEk6\r\nccKkEOpJpti8TV5_Ba\r\nccKKtbW_yN7BiA_WzL\r\nccKLa2gWEZQDwS7iEm\r\ncckLJQLraatlZf2NsZ\r\ncckp0lZaf9uDSkWtTb\r\ncckpGz2WnyFLNJF7Qf\r\ncckrPQSsVvRwhAbZUK\r\ncckvwwD3QPVbkNwO3V\r\ncckXPQf0SqboOx8J2t\r\nccKz6nDw8nFMNWSY9i\r\nccL08V3yXyN0t0FG1W\r\nccL5QR-4XRdfWkysDk\r\nccL7gNKu_PrCXazLE7\r\nccLFkojMFkald_ImQ9\r\nccLHuRgLmJUAO8_O4b\r\nccli5AizS00uz1QmlL\r\ncclj8CPn3aszPaXXjc\r\ncclobRdHSxaplcvYZE\r\ncclpV5Yg2sVOncG1oU\r\ncclTKCWr_QYEYTUb1A\r\nccltm1HVI14R_Fx9dd\r\nccLuojCzakgtuMJjFz\r\nccLvsOiLuUP7D9wXLw\r\nccLwHR-PCetD8b-4Qy\r\ncclwxpsYRBmg6U0tfA\r\nccm5DpWXd3_GsOv3Qd\r\nccmaMd-2JokobbuQ1o\r\nccMc4iZ5R0aSTLcvtg\r\nccmGzY7iGoGdz5seQ4\r\nccMIOfezAoU401Zlwr\r\nccmMseVlFtpAL_QvL9\r\nccMNYghfC_JaDOC0CP\r\nccMtc_nwiDlHBqFV68\r\nccmuL2pETQrzpAVqPm\r\nccn1Q63dOB9SAj2u5V\r\nccNAdy0LmALG1rkPNn\r\nccnBfG6RcRGae0XLOO\r\nccnISUM4DjuoHkksmO\r\nccnKgoxverUrHTLd9_\r\nccNNC3BTxtZHvEbkPD\r\nccNO7LSXpxA8GzQUHq\r\nccNOB_BY8JcoT_qD1h\r\nccNPcZgCWsxz-Ls4gy\r\nccNUDcUmNJtTJXkxoY\r\nccNuk85WxlrsMwszcx\r\nccnxAK3eGiKns4zgq5\r\nccnYMkOthN_GdvNsBE\r\nccnzlzke3vHILPLKVe\r\ncco8Npbi0TWmhfobpl\r\ncco9jLYSRJvsenIbK7\r\nccOB3fsK_G2WO-fDjO\r\nccObCJqT_JAot9-ilr\r\nccojKo6iEkSr3dEDt6\r\nccokikqpqz2SfCrGoK\r\nccoKVzAIKJI2V7W5vI\r\nccOOWpCWyXfOJc7nny\r\nccoPh7JD4hnw1B5FbK\r\nccOwgLDVR5giIpJEBB\r\nccP1Uyq09g2Wui1oKd\r\nccpan8-LC29N0vUBj9\r\nccPgCEJrub_-W3dU_h\r\nccPiepkvaG3-5TGCAM\r\nccPL8K_8eQ7ZltPS24\r\nccPLPwYdWdklk5DMcN\r\nccpLQ_ww-fdKPRb9sR\r\nccPPgeS9YgZD_TjFJQ\r\nccPrvG8hsfMzFht-bA\r\nccPSyVSik8N5dSHjsD\r\nccq6Hrjk_5Q_Ka460r\r\nccQ6XTun7EAUzMkIQO\r\nccqCYFwbfv-xx_HNm4\r\nccqKuYiOA4cdm2hOjy\r\nccQmwntftI5xtosFM2\r\nccQqnw6dTKINNZzxym\r\nccQqQq0yRZzpTULE1S\r\nccQR3mEFtiPYC-IYnS\r\nccQTm5ksXx_2rG-6mY\r\nccQWugUTRo10YUsBTA\r\nccqy6bgNloMazGUbVc\r\nccR0f9yvosjpZO2fj-\r\nccr93rZi2dqIaLDnTB\r\nccRcjPYdVen7mocTWf\r\nccrFWIV81v6WrMNv4H\r\nccrPX0XYfbUgRp7ge3\r\nccrRKxuFSRdC0wbG3B\r\nccrrSEhZygE_Zbq7F3\r\nccRRtUj6XGaYH55PnI\r\nccRUkOh2ZI_D3ofA7l\r\nccs1DS5ZWJxXypfOBM\r\nccs1sQhVDq4TyRKeGZ\r\nccs2ByjJvMrJW1_8kI\r\nccS3zv-mNuC03cg1LZ\r\nccS9to6nycOVSuKOHr\r\nccSdn-QoxZbhCiZhVZ\r\nccSf7UJHNVM9oVq3Lv\r\nccSFN2sVF7O6yFgkS-\r\nccshCJYNvPxVPvO54K\r\nccsjFbjUih-aym84hw\r\nccSOezFmBZkzRKm0as\r\nccspRcUAfVlo-EAPYz\r\nccsQNsC_S_62h6I9Fg\r\nccssCh1qCE_DDJkUsv\r\nccSu_T7CnBYErKaEkw\r\nccsv1eiRttYObnhVX_\r\nccsWvhSzBag03Kx-xZ\r\nccsZQ4_IwgDbko5CjC\r\nccTFwXI7g5wsWApAII\r\nccTNthHiKzctb4Zr05\r\ncctocM_AsWNBGXvDL7\r\ncctVb4dReiRdozOqyt\r\nccTxntooGSH-mon4SR\r\nccua3B8ahW_tZLkkIZ\r\nccUe2rfMWvPmrhsoOZ\r\nccuFkn_gPEpRct2lpI\r\nccuHDtSdSPlqPKCG7X\r\nccUogtB2N75x4FEtLG\r\nccuVYXRi0gcQjtzvuQ\r\nccuXgxxNDTsscPixj_\r\nccUytRjwQU3ybwjBqj\r\nccV2z7YSsO-btOj2vD\r\nccVa1viuRJwRVwmLQ8\r\nccVdr-p1OnUw0oC3ne\r\nccVG5-m21EfgmenvN_\r\nccVhHBujNEgiTQ6_-X\r\nccviCPjOq4o7lmfuZJ\r\nccvlV9VT50_-nWtt0Y\r\nccVQ6_NDtl7BuFqUay\r\nccVR8Qwdm-aN6DHeGJ\r\nccVsM1s5yu13QmYXoK\r\nccVtT-UXXltusmYPnQ\r\nccvvBQbpdY5gELlZHN\r\nccVYZsZTHb0Oy6XJw9\r\nccV_9Ewn8lpwluD6nv\r\nccV_ZDJdMRhJpWPfVd\r\nccw9fhZAE0U3P8DHm1\r\nccWAibsbNklMqVwnCl\r\nccwczmI81U0Vi0S8oT\r\nccwe6U1YrawwDjHFu7\r\nccWeYxFd64Xfbwliw8\r\nccwO7-RfHnJ2C6IMmX\r\nccwOHinVELGwfDti7Q\r\nccwOw-vkIcqVD-HXS0\r\nccWP9gmQUjOEJfqeN7\r\nccWpFQ6Mo6I7lUgfFG\r\nccwqGxT173Dzq63Qam\r\nccwSNOl47qtgTSdoDI\r\nccX45CzAZadxZ5EwJ4\r\nccx7nZ0WLweT9jPUXw\r\nccxdiZYZeTYQBdLxAz\r\nccxgW5qPqPOeQUlKDF\r\nccxhFRpbmbNt14Lzf1\r\nccXjMZIv-w4WSx3gc6\r\nccxKcvXYIkY926twsQ\r\nccxNjac90EpMKoB_ny\r\nccXpaj8p_KJC_NuuFD\r\nccxpvK6fIotUGBedPu\r\nccXQFO5Aosmn_TLA0h\r\nccXQv6YwPXvt_6Zav3\r\nccXSDXwZgISwPBuSLY\r\nccxT3yCA5NaDlNBfe-\r\nccxTQ1fP4nSHi4kxrD\r\nccxupPoBwXV6KVulLw\r\nccy7SZXgOz0SeJGEZq\r\nccyaTaFYqgCQ_vWZ1v\r\nccYByJ6Qw-8Lu6_vFU\r\nccyeA9_aJR1rzbwwAD\r\nccyF5TEMRtLbF4eFd2\r\nccYGgAbux8fefaWLKi\r\nccyhK1UXdSHmuRNLz_\r\nccYJALFkqaBwLoJx38\r\nccYjriucOuCm4DII2R\r\nccYoz00KVuU0k7lyAA\r\nccYpLPCTLlyM4JQBZH\r\nccYUKIXJ0b-t952Ud2\r\nccYvqPEFdnoZXhjbSL\r\nccYWX67dKd52_-JfNl\r\nccyzf9qH0xV86jkYzW\r\nccZ5bcrwC1QAlXGbNS\r\nccz5yAD_1Ozs3ED5t0\r\nccz6rLBnDgNOIMW8Gu\r\nccz8nCWl_nhG5C1lQQ\r\nccZaCiWC-1tNw9PWCV\r\ncczENvoldflmBrGkis\r\ncczIfHvNyBDrCIINAK\r\nccZo4KrkWq6_zo2aEU\r\ncczqkNyPSIr56MioHo\r\ncczsD1W4bFa-jSFiiN\r\ncczSoFiX4cZVX7YNY6\r\nccZvDkOXnzU_Don9Xl\r\nccZyIRe4tI-8eTYNzj\r\ncc_3N_jpjFTGhq1Qzw\r\ncc_7llUC4DZxyyjQ6P\r\ncc_ikmNg-IrQRcmnZU\r\ncc_JvkoDL0b5m\r\ncc_mIIkLkCvyL\r\ncc_RpKmIGKa1IYmEbO\r\ncc_VZq8rGrdf22PdHs\r\ncc_wupIz-mLkt\r\ncc_ZQQ20-Rcb4h_0K5\r\n".Split("\r\n").ToList();
+        //    utilsTools.setGDataByKey("testAllNames", testAllNames);
+        //    utilsTools.setGDataByKey("testIdx", 0);
+        //}
+        //List<string> strings = utilsTools.getGDataByKey<List<string>>("testAllNames", null);
+        //int idx = utilsTools.getGDataByKey<int>("testIdx", 0);
+        //if (idx > strings.Count)
+        //{
+        //    idx = strings.Count - 1;
+        //}
+        //string name = strings[idx];
+
 //#if UNITY_EDITOR
         Debug.Log("JSON:" + json);
+
         json = "{\"append\":\"\",\"classId\":\"1,8,10,14\",\"displayDate\":\"20221102\",\"enterType\":\"0\",\"extraJson\":\"{\\\"cut_height\\\": 0, \\\"refer_drawer\\\": \\\"DoMyzu\\\"}\",\"extraType\":0,\"file\":\"https://d21z6ifg4bbv2v.cloudfront.net/tsgame/cc--EDgRpc_nHQru7H.zip\",\"highImg\":\"https://d21z6ifg4bbv2v.cloudfront.net/tspng/cc--EDgRpc_nHQru7H.png\",\"hybridType\":64,\"id\":\"cc--EDgRpc_nHQru7H\",\"originalJson\":\"https://d21z6ifg4bbv2v.cloudfront.net/tsjson/cc--EDgRpc_nHQru7H.json\",\"picAssets\":\"{\\\"pictureBin\\\": \\\"ccv1/production-pic/20221027/cc--EDgRpc_nHQru7H/zsD2ySwS4pJ25frj.p\\\", \\\"pictureThn4\\\": \\\"ccv1/production-pic/20221027/cc--EDgRpc_nHQru7H/V8ZvUuDlOEB7mifd.png\\\", \\\"pictureColorThn4\\\": \\\"ccv1/production-pic/20221027/cc--EDgRpc_nHQru7H/IDdMO8yT0fPPhUtU.jpg?x-oss-process\\u003dstyle/cc400\\\", \\\"pictureWallThn8\\\": \\\"ccv1/production-pic/20221027/cc--EDgRpc_nHQru7H/oWqHjCo5mQvXIVP_.png\\\", \\\"pictureWallColorThn8\\\": \\\"ccv1/production-pic/20221027/cc--EDgRpc_nHQru7H/IDdMO8yT0fPPhUtU.jpg?x-oss-process\\u003dstyle/cc800\\\"}\",\"pictureBin\":\"https://d21z6ifg4bbv2v.cloudfront.net/tsgame/cc--EDgRpc_nHQru7H_pictureBin.p\",\"pictureColorThn4\":\"https://d21z6ifg4bbv2v.cloudfront.net/tsgame/cc--EDgRpc_nHQru7H_pictureColorThn4.jpg\",\"pictureThn4\":\"https://d21z6ifg4bbv2v.cloudfront.net/tsgame/cc--EDgRpc_nHQru7H_pictureThn4.png\",\"schedule\":0,\"seriesName\":\"\",\"sid\":2967,\"sort\":80,\"type\":6}";
+        //json = json.Replace("cc--EDgRpc_nHQru7H", name);
         //json = "{\"append\":\"\",\"classId\":\"1,8,10,14\",\"displayDate\":\"20221102\",\"enterType\":\"0\",\"extraJson\":\"{\\\"cut_height\\\": 0, \\\"refer_drawer\\\": \\\"DoMyzu\\\"}\",\"extraType\":0,\"file\":\"https://d21z6ifg4bbv2v.cloudfront.net/tsgame/ccnKNH1bTLS-_Mg7A2.zip\",\"highImg\":\"https://d21z6ifg4bbv2v.cloudfront.net/tspng/ccnKNH1bTLS-_Mg7A2.png\",\"hybridType\":64,\"id\":\"ccnKNH1bTLS-_Mg7A2\",\"originalJson\":\"https://d21z6ifg4bbv2v.cloudfront.net/tsjson/ccnKNH1bTLS-_Mg7A2.json\",\"picAssets\":\"{\\\"pictureBin\\\": \\\"ccv1/production-pic/20221027/ccnKNH1bTLS-_Mg7A2/zsD2ySwS4pJ25frj.p\\\", \\\"pictureThn4\\\": \\\"ccv1/production-pic/20221027/ccnKNH1bTLS-_Mg7A2/V8ZvUuDlOEB7mifd.png\\\", \\\"pictureColorThn4\\\": \\\"ccv1/production-pic/20221027/ccnKNH1bTLS-_Mg7A2/IDdMO8yT0fPPhUtU.jpg?x-oss-process\\u003dstyle/cc400\\\", \\\"pictureWallThn8\\\": \\\"ccv1/production-pic/20221027/ccnKNH1bTLS-_Mg7A2/oWqHjCo5mQvXIVP_.png\\\", \\\"pictureWallColorThn8\\\": \\\"ccv1/production-pic/20221027/ccnKNH1bTLS-_Mg7A2/IDdMO8yT0fPPhUtU.jpg?x-oss-process\\u003dstyle/cc800\\\"}\",\"pictureBin\":\"https://d21z6ifg4bbv2v.cloudfront.net/tsgame/ccnKNH1bTLS-_Mg7A2_pictureBin.p\",\"pictureColorThn4\":\"https://d21z6ifg4bbv2v.cloudfront.net/tsgame/ccnKNH1bTLS-_Mg7A2_pictureColorThn4.jpg\",\"pictureThn4\":\"https://d21z6ifg4bbv2v.cloudfront.net/tsgame/ccnKNH1bTLS-_Mg7A2_pictureThn4.png\",\"schedule\":0,\"seriesName\":\"\",\"sid\":2967,\"sort\":80,\"type\":6}";
 //#endif
         utilsTools.setGDataByKey("NativeGameData", JsonUtility.FromJson<netLableImageItem>(json));

Assets/scripts/common/gridView.cs

@@ -5,6 +5,7 @@ using System.Runtime.CompilerServices;
 using Unity.VisualScripting;
 using UnityEngine;
 using UnityEngine.UI;
+using static UnityEngine.Rendering.DebugUI.Table;
 
 public class gridView : MonoBehaviour
 {
@@ -213,19 +214,35 @@ public class gridView : MonoBehaviour
             childTransform.SetParent(null);
             GameObject.Destroy(childTransform.gameObject);
         }
+
+        //if (transform.name== "areaGroupList")
+        //{
+        //    StartCoroutine(TestDelay());
+        //}
+    }
+    IEnumerator TestDelay()
+    {
+        yield return new WaitForSeconds(0.5f);
+        var content = transform.GetComponent<ScrollRect>().content;
+        content.GetComponent<GridLayoutGroup>().gameObject.SetActive(false);
+        for (int i = 0; i < content.childCount; i++)
+        {
+            content.GetChild(i).GetComponent<colorItem>().SetLocalRootPos();
+        }
+        
     }
     //只支持一个预制体
     virtual public void setDataNoGrid(int size,float widthItem,float heightItem,float interval,gradViewBack back, bool useVec = true, GetGradViewInfo getGradViewInfo = null,float offset1 = 0.0f)
     {
-        Vector2 shipei = new Vector2 (widthItem,heightItem);
-        utilsTools.DeviceAdaptationSize(ref shipei);
-        widthItem = shipei.x;
-        heightItem = shipei.y;
-        shipei.x = interval;
-        shipei.y = offset1;
-        utilsTools.DeviceAdaptationSize(ref shipei);
-        interval = shipei.x;
-        offset1 = shipei.y; 
+        //Vector2 shipei = new Vector2 (widthItem,heightItem);
+        //utilsTools.DeviceAdaptationSize(ref shipei);
+        //widthItem = shipei.x;
+        //heightItem = shipei.y;
+        //shipei.x = interval;
+        //shipei.y = offset1;
+        //utilsTools.DeviceAdaptationSize(ref shipei);
+        //interval = shipei.x;
+        //offset1 = shipei.y; 
         if (perfabPaths.Count == 0)
         {
             perfabPaths.Add(perfabPath);
@@ -367,5 +384,6 @@ public class gridView : MonoBehaviour
             childTransform.SetParent(null);
             GameObject.Destroy(childTransform.gameObject);
         }
+        utilsTools.sendEventObjectParams("GroupIsLoadOver", null);
     }
 }

Assets/scripts/common/mainGameView.cs

@@ -469,6 +469,10 @@ public class mainGameView : MonoBehaviour //大图的处理、具体的玩法
         for (int i = 0; i < gameidJsondata.roomDatas.Count; i++)
         {
             var item = gameidJsondata.roomDatas[i];
+            if (item.IsValid() == false)
+            {
+                continue;
+            }
             if (digitMatrix.Data[item.px, item.py] >= 20)
             {
                 item.tempExKey = "idFlg_" + item.gid.ToString() + "_"+item.id.ToString();
@@ -1103,43 +1107,43 @@ public class mainGameView : MonoBehaviour //大图的处理、具体的玩法
     {
         baseUpdate();
 
-        if (Input.mouseScrollDelta.y < 0) //滚轮向前滚动
-        {
-            var scal = new Vector3(transform.localScale.x - Input.mouseScrollDelta.y, transform.localScale.y - Input.mouseScrollDelta.y, 0);
-            if (scal.x > 5)
-                scal = Vector3.one * 5;
-            transform.localScale = scal;
-        }
-        if (Input.mouseScrollDelta.y > 0) //滚轮向后滚动
-        {
-            var scal = new Vector3(transform.localScale.x + Input.mouseScrollDelta.y, transform.localScale.y + Input.mouseScrollDelta.y, 0);
-            if (scal.x < 1)
-                scal = Vector3.one;
-            transform.localScale = scal;
-        }
+        //if (Input.mouseScrollDelta.y < 0) //滚轮向前滚动
+        //{
+        //    var scal = new Vector3(transform.localScale.x - Input.mouseScrollDelta.y, transform.localScale.y - Input.mouseScrollDelta.y, 0);
+        //    if (scal.x > 5)
+        //        scal = Vector3.one * 5;
+        //    transform.localScale = scal;
+        //}
+        //if (Input.mouseScrollDelta.y > 0) //滚轮向后滚动
+        //{
+        //    var scal = new Vector3(transform.localScale.x + Input.mouseScrollDelta.y, transform.localScale.y + Input.mouseScrollDelta.y, 0);
+        //    if (scal.x < 1)
+        //        scal = Vector3.one;
+        //    transform.localScale = scal;
+        //}
 
-        if (Input.GetMouseButton(0)) //暂时先这样实现编辑器里的鼠标拖动
-        {
-            if (flag)
-            {
-                mouse_oldpos = mouse_nowpos;
-                mouse_nowpos = Input.mousePosition;
+        //if (Input.GetMouseButton(0)) //暂时先这样实现编辑器里的鼠标拖动
+        //{
+        //    if (flag)
+        //    {
+        //        mouse_oldpos = mouse_nowpos;
+        //        mouse_nowpos = Input.mousePosition;
 
-                var pos_x = mouse_nowpos.x - mouse_oldpos.x;
-                var pos_y=mouse_nowpos.y- mouse_oldpos.y;
+        //        var pos_x = mouse_nowpos.x - mouse_oldpos.x;
+        //        var pos_y=mouse_nowpos.y- mouse_oldpos.y;
 
-                transform.localPosition = new Vector3(transform.localPosition.x + pos_x, transform.localPosition.y + pos_y, 0);
+        //        transform.localPosition = new Vector3(transform.localPosition.x + pos_x, transform.localPosition.y + pos_y, 0);
 
 
-            }
-            else
-            {
-                mouse_oldpos = Input.mousePosition;
-            }
-            mouse_nowpos = Input.mousePosition;
-            flag = true;
+        //    }
+        //    else
+        //    {
+        //        mouse_oldpos = Input.mousePosition;
+        //    }
+        //    mouse_nowpos = Input.mousePosition;
+        //    flag = true;
 
-        }
+        //}
         if (Input.GetMouseButtonUp(0))
         {
             flag = false;

Assets/scripts/perfabItems/colorItem.cs

+using DG.Tweening;
 using System;
 using System.Collections;
 using System.Collections.Generic;
@@ -23,6 +24,8 @@ public class colorItem : MonoBehaviour
     private List<Vector2> initScaleSize = new List<Vector2>();
     private float offset = 0;
 
+    private Vector3 LocalPos_Root;//记录实例化出来后在本地的原始坐标
+    
     void initMember()
     {
         if(effectImg == null)
@@ -34,6 +37,7 @@ public class colorItem : MonoBehaviour
             normalScale = transform.localScale * 0.85f;  
             transform.localScale = normalScale;
         }
+        transform.localScale = Vector3.one * 0.8f;
     }
     public bool IsSelect
     {
@@ -58,31 +62,39 @@ public class colorItem : MonoBehaviour
         if (transform == null) return;
         RectTransform rectTransform = (RectTransform)transform;
         float x = transform.localPosition.x;
+        //if (isSelect)
+        //{
+        //    transform.localPosition = new Vector2(x, 0 - (transform.localScale.y * rectTransform.rect.height) / 2 - offset);
+        //    transform.localScale = normalScale;
+        //    ActionManages.addMoveByScale(gameObject, normalScale * 1.2f, 0.25f);
+        //}
+        //else
+        //{
+        //    transform.localScale = normalScale * 1.2f;
+        //    transform.localPosition = new Vector2(x, 0 - (transform.localScale.y * rectTransform.rect.height) / 2 - offset);
+        //    ActionManages.addMoveByScale(gameObject, normalScale, 0.25f);
+        //}
+
         if (isSelect)
         {
-            transform.localPosition = new Vector2(x, 0 - (transform.localScale.y * rectTransform.rect.height) / 2 - offset);
-            transform.localScale = normalScale;
-            ActionManages.addMoveByScale(gameObject, normalScale * 1.2f, 0.25f);
+            transform.DOScale(Vector3.one * 0.9f, 0.5f);
         }
         else
         {
-            transform.localScale = normalScale * 1.2f;
-            transform.localPosition = new Vector2(x, 0 - (transform.localScale.y * rectTransform.rect.height) / 2 - offset);
-            ActionManages.addMoveByScale(gameObject, normalScale, 0.25f);
+            transform.DOScale(Vector3.one * 0.8f, 0.5f);
         }
 
 
-
-        ActionManages.addCallBackByLen(gameObject, 1000, 0.25f, (float _) =>
-        {
-            //transform.localPosition = new Vector2(x, 0 - (transform.localScale.y * rectTransform.rect.height) / 2 - offset);
-            rectTransform.anchoredPosition = new Vector2(rectTransform.anchoredPosition.x, 0);
-        }, (GameObject gobject, int id) =>
-        {
-            //float a = transform.localScale.y * rectTransform.rect.height;
-            //transform.localPosition = new Vector2(x, 0 - (transform.localScale.y * rectTransform.rect.height) / 2 - offset);
-            rectTransform.anchoredPosition = new Vector2(rectTransform.anchoredPosition.x, 0);
-        });
+        //ActionManages.addCallBackByLen(gameObject, 1000, 0.25f, (float _) =>
+        //{
+        //    //transform.localPosition = new Vector2(x, 0 - (transform.localScale.y * rectTransform.rect.height) / 2 - offset);
+        //    rectTransform.anchoredPosition = new Vector2(rectTransform.anchoredPosition.x, 0);
+        //}, (GameObject gobject, int id) =>
+        //{
+        //    //float a = transform.localScale.y * rectTransform.rect.height;
+        //    //transform.localPosition = new Vector2(x, 0 - (transform.localScale.y * rectTransform.rect.height) / 2 - offset);
+        //    rectTransform.anchoredPosition = new Vector2(rectTransform.anchoredPosition.x, 0);
+        //});
     }
     public void switchPlayAnimation1()
     {
@@ -204,7 +216,6 @@ public class colorItem : MonoBehaviour
     // Start is called before the first frame update
     void Start()
     {
-        Debug.LogError($"Test{transform.name}");
         initMember();
         //IsSelect = isSelect;
         //IdName = idName;
@@ -236,4 +247,23 @@ public class colorItem : MonoBehaviour
     public void resetSize(float x,float y)
     {
     }
+
+    public void SetLocalRootPos() //保存一下本地的原始坐标
+    {
+        LocalPos_Root = transform.localPosition;
+    }
+
+    public void ChangeLocalPos_Select(bool left,int clickindex,float clickpos) //当点击组的时候，其它往外面偏移一段
+    {
+        if (left) //左边
+        {
+            transform.DOLocalMoveX(clickpos - 120 * (clickindex - index) - 20, 0.5f);
+            //transform.DOLocalMoveX(LocalPos_Root.x - 10, 0.5f);
+        }
+        else
+        {
+            transform.DOLocalMoveX(clickpos + 120 * (index - clickindex) + 20, 0.5f);
+            //transform.DOLocalMoveX(LocalPos_Root.x + 10, 0.5f);     
+        }
+    }
 }