Commit dcf1d525 authored by shujianhe's avatar shujianhe

1 加载场景调整和测试用缩略图

2 组列表调整
3 终止更新缩略图
4 游戏进度从服务器拉去
5 关闭立即上报行为,20帧后在实际跳转
parent 18f481ea
...@@ -76,6 +76,82 @@ MonoBehaviour: ...@@ -76,6 +76,82 @@ MonoBehaviour:
m_FillOrigin: 0 m_FillOrigin: 0
m_UseSpriteMesh: 0 m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1 m_PixelsPerUnitMultiplier: 1
--- !u!1 &165307577509819478
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 216671789900275948}
- component: {fileID: 1520829811932201433}
- component: {fileID: 948336499519928204}
m_Layer: 0
m_Name: groupListBg
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &216671789900275948
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 165307577509819478}
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_RootOrder: -1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0.5}
m_AnchorMax: {x: 1, y: 0.5}
m_AnchoredPosition: {x: -41, y: -1582}
m_SizeDelta: {x: 0, y: 800}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1520829811932201433
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 165307577509819478}
m_CullTransparentMesh: 1
--- !u!114 &948336499519928204
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 165307577509819478}
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: 0}
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 &367631070194179690 --- !u!1 &367631070194179690
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
...@@ -206,6 +282,7 @@ RectTransform: ...@@ -206,6 +282,7 @@ RectTransform:
- {fileID: 2696017519285237368} - {fileID: 2696017519285237368}
- {fileID: 9202005404466210624} - {fileID: 9202005404466210624}
- {fileID: 3684281432546734940} - {fileID: 3684281432546734940}
- {fileID: 216671789900275948}
- {fileID: 7778848243247776032} - {fileID: 7778848243247776032}
- {fileID: 4207755507653322023} - {fileID: 4207755507653322023}
- {fileID: 1976999355571500960} - {fileID: 1976999355571500960}
...@@ -937,7 +1014,7 @@ RectTransform: ...@@ -937,7 +1014,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0} m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 0} m_AnchorMax: {x: 1, y: 0}
m_AnchoredPosition: {x: 0, y: 314} m_AnchoredPosition: {x: 4, y: 840}
m_SizeDelta: {x: 0, y: 25} m_SizeDelta: {x: 0, y: 25}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1036549963076789408 --- !u!114 &1036549963076789408
...@@ -1478,7 +1555,7 @@ MonoBehaviour: ...@@ -1478,7 +1555,7 @@ MonoBehaviour:
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
m_Material: {fileID: 0} m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1} m_Color: {r: 0.9490196, g: 0.9490196, b: 0.9490196, a: 1}
m_RaycastTarget: 1 m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1 m_Maskable: 1
...@@ -1668,7 +1745,7 @@ RectTransform: ...@@ -1668,7 +1745,7 @@ RectTransform:
m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -38, y: -282} m_AnchoredPosition: {x: -38, y: -282}
m_SizeDelta: {x: 640, y: 30} m_SizeDelta: {x: 900, y: 30}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &770547139677435937 --- !u!114 &770547139677435937
MonoBehaviour: MonoBehaviour:
...@@ -1768,7 +1845,7 @@ RectTransform: ...@@ -1768,7 +1845,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0} m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 0} m_AnchorMax: {x: 1, y: 0}
m_AnchoredPosition: {x: 0, y: 295.4} m_AnchoredPosition: {x: 4, y: 821.4}
m_SizeDelta: {x: 0, y: 25} m_SizeDelta: {x: 0, y: 25}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &2831736868530311398 --- !u!222 &2831736868530311398
...@@ -2353,7 +2430,7 @@ RectTransform: ...@@ -2353,7 +2430,7 @@ RectTransform:
m_GameObject: {fileID: 5697974217771189481} m_GameObject: {fileID: 5697974217771189481}
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_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 0.8, y: 0.8, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0 m_ConstrainProportionsScale: 0
m_Children: [] m_Children: []
m_Father: {fileID: 4930126960711289547} m_Father: {fileID: 4930126960711289547}
...@@ -2361,8 +2438,8 @@ RectTransform: ...@@ -2361,8 +2438,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -6, y: -127} m_AnchoredPosition: {x: 0, y: -127}
m_SizeDelta: {x: 1000, y: 1000} m_SizeDelta: {x: 1200, y: 1200}
m_Pivot: {x: 0.5, y: 0} m_Pivot: {x: 0.5, y: 0}
--- !u!222 &2672100261875538246 --- !u!222 &2672100261875538246
CanvasRenderer: CanvasRenderer:
...@@ -2738,7 +2815,7 @@ RectTransform: ...@@ -2738,7 +2815,7 @@ RectTransform:
m_AnchorMin: {x: 0, y: 1} m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: -0.00012207031, y: 0.00024414062} m_AnchoredPosition: {x: -0.00012207031, y: 0.00024414062}
m_SizeDelta: {x: 0, y: 290} m_SizeDelta: {x: 0, y: 440}
m_Pivot: {x: 0, y: 1} m_Pivot: {x: 0, y: 1}
--- !u!222 &6177109562948806136 --- !u!222 &6177109562948806136
CanvasRenderer: CanvasRenderer:
...@@ -2761,7 +2838,7 @@ MonoBehaviour: ...@@ -2761,7 +2838,7 @@ MonoBehaviour:
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
m_Material: {fileID: 0} m_Material: {fileID: 0}
m_Color: {r: 0.9411765, g: 0.9411765, b: 0.9411765, a: 1} m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1 m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1 m_Maskable: 1
...@@ -2844,7 +2921,7 @@ MonoBehaviour: ...@@ -2844,7 +2921,7 @@ MonoBehaviour:
m_OnCullStateChanged: m_OnCullStateChanged:
m_PersistentCalls: m_PersistentCalls:
m_Calls: [] m_Calls: []
m_Sprite: {fileID: 21300000, guid: a739bbba4c0a9a94085973b67bc95bcf, type: 3} m_Sprite: {fileID: 21300000, guid: ee269de026792d844afca7b89b541787, type: 3}
m_Type: 0 m_Type: 0
m_PreserveAspect: 0 m_PreserveAspect: 0
m_FillCenter: 1 m_FillCenter: 1
...@@ -2868,7 +2945,6 @@ GameObject: ...@@ -2868,7 +2945,6 @@ GameObject:
- component: {fileID: 8127201246377606253} - component: {fileID: 8127201246377606253}
- component: {fileID: 249506130850906235} - component: {fileID: 249506130850906235}
- component: {fileID: 3881126791468221942} - component: {fileID: 3881126791468221942}
- component: {fileID: 4691931816764605594}
m_Layer: 0 m_Layer: 0
m_Name: gameShowView m_Name: gameShowView
m_TagString: Untagged m_TagString: Untagged
...@@ -2979,36 +3055,6 @@ MonoBehaviour: ...@@ -2979,36 +3055,6 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 7d1f5d2c8f31b4b408c2617ac6ccbcde, type: 3} m_Script: {fileID: 11500000, guid: 7d1f5d2c8f31b4b408c2617ac6ccbcde, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
--- !u!114 &4691931816764605594
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6769909122946713645}
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: 0}
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 &6841462502927162422 --- !u!1 &6841462502927162422
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
...@@ -3714,8 +3760,8 @@ RectTransform: ...@@ -3714,8 +3760,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0} m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 0} m_AnchorMax: {x: 1, y: 0}
m_AnchoredPosition: {x: 0, y: 0} m_AnchoredPosition: {x: -4, y: 353}
m_SizeDelta: {x: 0, y: 300} m_SizeDelta: {x: 0, y: 440}
m_Pivot: {x: 0.5, y: 0} m_Pivot: {x: 0.5, y: 0}
--- !u!222 &660496339158997908 --- !u!222 &660496339158997908
CanvasRenderer: CanvasRenderer:
...@@ -3738,14 +3784,14 @@ MonoBehaviour: ...@@ -3738,14 +3784,14 @@ MonoBehaviour:
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
m_Material: {fileID: 0} m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 0.20784314} m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1 m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1 m_Maskable: 1
m_OnCullStateChanged: m_OnCullStateChanged:
m_PersistentCalls: m_PersistentCalls:
m_Calls: [] m_Calls: []
m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0} m_Sprite: {fileID: 0}
m_Type: 1 m_Type: 1
m_PreserveAspect: 0 m_PreserveAspect: 0
m_FillCenter: 1 m_FillCenter: 1
......
...@@ -289,6 +289,35 @@ RectTransform: ...@@ -289,6 +289,35 @@ RectTransform:
m_CorrespondingSourceObject: {fileID: 1633357141748549960, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3} m_CorrespondingSourceObject: {fileID: 1633357141748549960, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3}
m_PrefabInstance: {fileID: 1821187684178258737} m_PrefabInstance: {fileID: 1821187684178258737}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
--- !u!1 &1749927914 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 5978997263012059768, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3}
m_PrefabInstance: {fileID: 1821187684178258737}
m_PrefabAsset: {fileID: 0}
--- !u!114 &1749927918
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1749927914}
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: 10
m_Top: 0
m_Bottom: 0
m_ChildAlignment: 3
m_StartCorner: 0
m_StartAxis: 0
m_CellSize: {x: 280, y: 280}
m_Spacing: {x: 5, y: 0}
m_Constraint: 2
m_ConstraintCount: 1
--- !u!1001 &1821187684178258737 --- !u!1001 &1821187684178258737
PrefabInstance: PrefabInstance:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
...@@ -313,10 +342,22 @@ PrefabInstance: ...@@ -313,10 +342,22 @@ PrefabInstance:
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName
value: onContinueHandler value: onContinueHandler
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 216671789900275948, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3}
propertyPath: m_SizeDelta.x
value: 200
objectReference: {fileID: 0}
- target: {fileID: 216671789900275948, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 401614864274373127, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3} - target: {fileID: 401614864274373127, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3}
propertyPath: m_Name propertyPath: m_Name
value: Canvas value: Canvas
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 413511353391081588, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3}
propertyPath: m_Sprite
value:
objectReference: {fileID: 21300000, guid: cc17797b19aa99741839e64bc6dd1f4a, type: 3}
- target: {fileID: 422105211135309262, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3} - target: {fileID: 422105211135309262, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3}
propertyPath: m_IsActive propertyPath: m_IsActive
value: 1 value: 1
...@@ -339,11 +380,19 @@ PrefabInstance: ...@@ -339,11 +380,19 @@ PrefabInstance:
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 503614355353602301, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3} - target: {fileID: 503614355353602301, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3}
propertyPath: m_SizeDelta.x propertyPath: m_SizeDelta.x
value: 1000 value: 1200
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 503614355353602301, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3} - target: {fileID: 503614355353602301, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3}
propertyPath: m_SizeDelta.y propertyPath: m_SizeDelta.y
value: 1000 value: 1200
objectReference: {fileID: 0}
- target: {fileID: 503614355353602301, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3}
propertyPath: m_LocalScale.x
value: 1.2
objectReference: {fileID: 0}
- target: {fileID: 503614355353602301, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3}
propertyPath: m_LocalScale.y
value: 1.2
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 503614355353602301, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3} - target: {fileID: 503614355353602301, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3}
propertyPath: m_AnchoredPosition.y propertyPath: m_AnchoredPosition.y
...@@ -381,10 +430,38 @@ PrefabInstance: ...@@ -381,10 +430,38 @@ PrefabInstance:
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName
value: UnityEngine.Object, UnityEngine value: UnityEngine.Object, UnityEngine
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 579534837900412603, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3}
propertyPath: m_Color.b
value: 0.9490196
objectReference: {fileID: 0}
- target: {fileID: 579534837900412603, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3}
propertyPath: m_Color.g
value: 0.9490196
objectReference: {fileID: 0}
- target: {fileID: 579534837900412603, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3}
propertyPath: m_Color.r
value: 0.9490196
objectReference: {fileID: 0}
- target: {fileID: 601494152891192310, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3} - target: {fileID: 601494152891192310, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3}
propertyPath: m_IsActive propertyPath: m_IsActive
value: 0 value: 0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 813922290362976613, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3}
propertyPath: m_Size
value: 1
objectReference: {fileID: 0}
- target: {fileID: 948336499519928204, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3}
propertyPath: m_Color.b
value: 1
objectReference: {fileID: 0}
- target: {fileID: 948336499519928204, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3}
propertyPath: m_Color.g
value: 1
objectReference: {fileID: 0}
- target: {fileID: 948336499519928204, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3}
propertyPath: m_Color.r
value: 1
objectReference: {fileID: 0}
- target: {fileID: 1194477751654865661, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3} - target: {fileID: 1194477751654865661, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.size propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.size
value: 0 value: 0
...@@ -397,6 +474,14 @@ PrefabInstance: ...@@ -397,6 +474,14 @@ PrefabInstance:
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName
value: value:
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 1345706252318982597, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3}
propertyPath: m_Size
value: 1
objectReference: {fileID: 0}
- target: {fileID: 1345706252318982597, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3}
propertyPath: m_Value
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1633357141748549960, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3} - target: {fileID: 1633357141748549960, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3}
propertyPath: m_Pivot.x propertyPath: m_Pivot.x
value: 0 value: 0
...@@ -481,18 +566,38 @@ PrefabInstance: ...@@ -481,18 +566,38 @@ PrefabInstance:
propertyPath: m_LocalEulerAnglesHint.z propertyPath: m_LocalEulerAnglesHint.z
value: 0 value: 0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 1682976293997861255, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3}
propertyPath: m_LocalScale.x
value: 2
objectReference: {fileID: 0}
- target: {fileID: 1682976293997861255, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3}
propertyPath: m_LocalScale.y
value: 2
objectReference: {fileID: 0}
- target: {fileID: 1682976293997861255, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3} - target: {fileID: 1682976293997861255, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3}
propertyPath: m_AnchoredPosition.x propertyPath: m_AnchoredPosition.x
value: -769 value: -546
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 1682976293997861255, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3} - target: {fileID: 1682976293997861255, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3}
propertyPath: m_AnchoredPosition.y propertyPath: m_AnchoredPosition.y
value: -1791 value: -1164
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 1768046760152476349, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3} - target: {fileID: 1768046760152476349, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3}
propertyPath: m_IsActive propertyPath: m_IsActive
value: 1 value: 1
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 1976999355571500960, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3}
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1976999355571500960, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1976999355571500960, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3}
propertyPath: m_AnchoredPosition.y
value: 696.4
objectReference: {fileID: 0}
- target: {fileID: 2125809588161684614, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3} - target: {fileID: 2125809588161684614, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3}
propertyPath: m_AnchorMax.x propertyPath: m_AnchorMax.x
value: 0.5 value: 0.5
...@@ -525,6 +630,10 @@ PrefabInstance: ...@@ -525,6 +630,10 @@ PrefabInstance:
propertyPath: m_AnchoredPosition.y propertyPath: m_AnchoredPosition.y
value: 125 value: 125
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 2145984797572034496, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2397888016392641895, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3} - target: {fileID: 2397888016392641895, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3}
propertyPath: m_IsActive propertyPath: m_IsActive
value: 1 value: 1
...@@ -541,6 +650,10 @@ PrefabInstance: ...@@ -541,6 +650,10 @@ PrefabInstance:
propertyPath: m_SizeDelta.y propertyPath: m_SizeDelta.y
value: 102 value: 102
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 2488998574890369715, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3}
propertyPath: m_AnchoredPosition.y
value: -1030
objectReference: {fileID: 0}
- target: {fileID: 2545109457425451164, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3} - target: {fileID: 2545109457425451164, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3}
propertyPath: m_AnchorMax.x propertyPath: m_AnchorMax.x
value: 0 value: 0
...@@ -555,7 +668,7 @@ PrefabInstance: ...@@ -555,7 +668,7 @@ PrefabInstance:
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 2696017519285237368, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3} - target: {fileID: 2696017519285237368, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3}
propertyPath: m_AnchoredPosition.y propertyPath: m_AnchoredPosition.y
value: -100.00012 value: -100
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 3205611354668530150, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3} - target: {fileID: 3205611354668530150, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.size propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.size
...@@ -653,6 +766,10 @@ PrefabInstance: ...@@ -653,6 +766,10 @@ PrefabInstance:
propertyPath: m_SizeDelta.y propertyPath: m_SizeDelta.y
value: 224 value: 224
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 3916702469807618879, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3}
propertyPath: m_AnchoredPosition.y
value: -101
objectReference: {fileID: 0}
- target: {fileID: 4139363703275230209, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3} - target: {fileID: 4139363703275230209, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3}
propertyPath: m_AnchorMax.x propertyPath: m_AnchorMax.x
value: 0.5 value: 0.5
...@@ -685,17 +802,29 @@ PrefabInstance: ...@@ -685,17 +802,29 @@ PrefabInstance:
propertyPath: m_AnchoredPosition.y propertyPath: m_AnchoredPosition.y
value: 125 value: 125
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 4207755507653322023, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3}
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4207755507653322023, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4207755507653322023, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3}
propertyPath: m_AnchoredPosition.y
value: 715
objectReference: {fileID: 0}
- target: {fileID: 4886643278448710515, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3} - target: {fileID: 4886643278448710515, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3}
propertyPath: itemWidth propertyPath: itemWidth
value: 130 value: 400
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 4886643278448710515, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3} - target: {fileID: 4886643278448710515, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3}
propertyPath: itemHeight propertyPath: itemHeight
value: 130 value: 400
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 4886643278448710515, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3} - target: {fileID: 4886643278448710515, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3}
propertyPath: itemInterval propertyPath: itemInterval
value: -10 value: 0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 4930126960711289547, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3} - target: {fileID: 4930126960711289547, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3}
propertyPath: m_AnchorMax.x propertyPath: m_AnchorMax.x
...@@ -727,16 +856,24 @@ PrefabInstance: ...@@ -727,16 +856,24 @@ PrefabInstance:
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 5145632994799020238, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3} - target: {fileID: 5145632994799020238, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3}
propertyPath: m_SizeDelta.y propertyPath: m_SizeDelta.y
value: 130 value: 420
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 5145632994799020238, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3} - target: {fileID: 5145632994799020238, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3}
propertyPath: m_AnchoredPosition.x propertyPath: m_AnchoredPosition.x
value: 0.00012207031 value: 0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 5145632994799020238, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3} - target: {fileID: 5145632994799020238, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3}
propertyPath: m_AnchoredPosition.y propertyPath: m_AnchoredPosition.y
value: 0 value: 0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 5446485606855009903, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3}
propertyPath: m_AnchoredPosition.x
value: -149
objectReference: {fileID: 0}
- target: {fileID: 5446485606855009903, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3}
propertyPath: m_AnchoredPosition.y
value: -165
objectReference: {fileID: 0}
- target: {fileID: 5503889877563921631, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3} - target: {fileID: 5503889877563921631, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3}
propertyPath: m_AnchorMax.x propertyPath: m_AnchorMax.x
value: 0.5 value: 0.5
...@@ -789,6 +926,18 @@ PrefabInstance: ...@@ -789,6 +926,18 @@ PrefabInstance:
propertyPath: m_Color.a propertyPath: m_Color.a
value: 1 value: 1
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 6288710243067134574, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3}
propertyPath: m_Color.b
value: 1
objectReference: {fileID: 0}
- target: {fileID: 6288710243067134574, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3}
propertyPath: m_Color.g
value: 1
objectReference: {fileID: 0}
- target: {fileID: 6288710243067134574, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3}
propertyPath: m_Color.r
value: 1
objectReference: {fileID: 0}
- target: {fileID: 6769909122946713645, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3} - target: {fileID: 6769909122946713645, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3}
propertyPath: m_IsActive propertyPath: m_IsActive
value: 1 value: 1
...@@ -815,15 +964,15 @@ PrefabInstance: ...@@ -815,15 +964,15 @@ PrefabInstance:
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 6885165270998615511, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3} - target: {fileID: 6885165270998615511, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3}
propertyPath: m_AnchorMax.x propertyPath: m_AnchorMax.x
value: 1 value: 0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 6885165270998615511, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3} - target: {fileID: 6885165270998615511, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3}
propertyPath: m_AnchorMax.y propertyPath: m_AnchorMax.y
value: 1 value: 0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 6885165270998615511, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3} - target: {fileID: 6885165270998615511, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3}
propertyPath: m_AnchorMin.x propertyPath: m_AnchorMin.x
value: 1 value: 0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 7060587662440544068, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3} - target: {fileID: 7060587662440544068, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3}
propertyPath: m_Type propertyPath: m_Type
...@@ -857,6 +1006,10 @@ PrefabInstance: ...@@ -857,6 +1006,10 @@ PrefabInstance:
propertyPath: m_AnchorMin.y propertyPath: m_AnchorMin.y
value: 0 value: 0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 7428985397092881503, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3}
propertyPath: m_Vertical
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7587099083242171649, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3} - target: {fileID: 7587099083242171649, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3}
propertyPath: minShowFontSize propertyPath: minShowFontSize
value: 20 value: 20
...@@ -877,9 +1030,21 @@ PrefabInstance: ...@@ -877,9 +1030,21 @@ PrefabInstance:
propertyPath: m_Sprite propertyPath: m_Sprite
value: value:
objectReference: {fileID: 21300000, guid: 611d9cc12d2a47a4789c58dcd0441715, type: 3} objectReference: {fileID: 21300000, guid: 611d9cc12d2a47a4789c58dcd0441715, type: 3}
- target: {fileID: 7778848243247776032, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3}
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7778848243247776032, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3} - target: {fileID: 7778848243247776032, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3}
propertyPath: m_SizeDelta.y propertyPath: m_SizeDelta.y
value: 140 value: 440
objectReference: {fileID: 0}
- target: {fileID: 7778848243247776032, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7778848243247776032, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3}
propertyPath: m_AnchoredPosition.y
value: 281
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 8235616612504007133, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3} - target: {fileID: 8235616612504007133, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3}
propertyPath: m_AnchorMax.x propertyPath: m_AnchorMax.x
...@@ -915,39 +1080,47 @@ PrefabInstance: ...@@ -915,39 +1080,47 @@ PrefabInstance:
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 9189191146825682432, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3} - target: {fileID: 9189191146825682432, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3}
propertyPath: m_SizeDelta.x propertyPath: m_SizeDelta.x
value: 640 value: 1020
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 9189191146825682432, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3} - target: {fileID: 9189191146825682432, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3}
propertyPath: m_SizeDelta.y propertyPath: m_SizeDelta.y
value: 30 value: 30
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 9189191146825682432, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3}
propertyPath: m_LocalScale.x
value: 1.2
objectReference: {fileID: 0}
- target: {fileID: 9189191146825682432, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 9189191146825682432, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3} - target: {fileID: 9189191146825682432, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3}
propertyPath: m_AnchoredPosition.y propertyPath: m_AnchoredPosition.y
value: -406 value: -406
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 9202005404466210624, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3} - target: {fileID: 9202005404466210624, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3}
propertyPath: m_AnchorMax.x propertyPath: m_AnchorMax.x
value: 1 value: 0.5
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 9202005404466210624, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3} - target: {fileID: 9202005404466210624, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3}
propertyPath: m_AnchorMax.y propertyPath: m_AnchorMax.y
value: 1 value: 0.5
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 9202005404466210624, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3} - target: {fileID: 9202005404466210624, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3}
propertyPath: m_AnchorMin.x propertyPath: m_AnchorMin.x
value: 0 value: 0.5
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 9202005404466210624, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3} - target: {fileID: 9202005404466210624, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3}
propertyPath: m_AnchorMin.y propertyPath: m_AnchorMin.y
value: 0 value: 0.5
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 9202005404466210624, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3} - target: {fileID: 9202005404466210624, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3}
propertyPath: m_SizeDelta.x propertyPath: m_SizeDelta.x
value: 0 value: 1920
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 9202005404466210624, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3} - target: {fileID: 9202005404466210624, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3}
propertyPath: m_SizeDelta.y propertyPath: m_SizeDelta.y
value: -650 value: 3152
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 9202005404466210624, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3} - target: {fileID: 9202005404466210624, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3}
propertyPath: m_AnchoredPosition.x propertyPath: m_AnchoredPosition.x
...@@ -957,11 +1130,15 @@ PrefabInstance: ...@@ -957,11 +1130,15 @@ PrefabInstance:
propertyPath: m_AnchoredPosition.y propertyPath: m_AnchoredPosition.y
value: 125 value: 125
objectReference: {fileID: 0} objectReference: {fileID: 0}
m_RemovedComponents: [] m_RemovedComponents:
- {fileID: 4691931816764605594, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3}
m_RemovedGameObjects: m_RemovedGameObjects:
- {fileID: 7579613037584348143, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3} - {fileID: 7579613037584348143, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3}
m_AddedGameObjects: [] m_AddedGameObjects: []
m_AddedComponents: [] m_AddedComponents:
- targetCorrespondingSourceObject: {fileID: 5978997263012059768, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3}
insertIndex: -1
addedObject: {fileID: 1749927918}
m_SourcePrefab: {fileID: 100100000, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3} m_SourcePrefab: {fileID: 100100000, guid: e2f00cfdb21d04b46adf17805f74f20c, type: 3}
--- !u!114 &1821187684178258738 stripped --- !u!114 &1821187684178258738 stripped
MonoBehaviour: MonoBehaviour:
......
...@@ -15,6 +15,7 @@ public class AreaInfoUseData ...@@ -15,6 +15,7 @@ public class AreaInfoUseData
public class GameScenUserInfo public class GameScenUserInfo
{ {
static public string RunGameDatasRootName = "gameData"; static public string RunGameDatasRootName = "gameData";
public string thumbnailUrl = "";
public string img = "";//线图 public string img = "";//线图
public string json = "";//数据 public string json = "";//数据
public string finishImg = "";//完成图 public string finishImg = "";//完成图
...@@ -96,6 +97,7 @@ public class GameScenUserInfo ...@@ -96,6 +97,7 @@ public class GameScenUserInfo
} }
public void setShowAreaids(string areaids) public void setShowAreaids(string areaids)
{ {
if (areaids.Equals("")) return;
string[] ids = areaids.Split(","); string[] ids = areaids.Split(",");
Dictionary<short, bool> existIds = new Dictionary<short, bool>(); Dictionary<short, bool> existIds = new Dictionary<short, bool>();
foreach (var item in areaInfoUseData) foreach (var item in areaInfoUseData)
......
...@@ -81,3 +81,30 @@ public class netLableImageItem: System.Object ...@@ -81,3 +81,30 @@ public class netLableImageItem: System.Object
return id; return id;
} }
} }
[System.Serializable]
public class resutltObject<T>
{
public T data;
}
public class HistoryClick
{
public int status;
public string msg;
public string sign;
public resutltObject<HistoryClickData> result;
public string getHistory()
{
List<int> history = new List<int>();
if (status.Equals(200))
{
HistoryClickData historyClickData = (HistoryClickData)result.data;
return historyClickData.append;
}
return "";
}
}
[System.Serializable]
public class HistoryClickData
{
public string append = "";
}
\ No newline at end of file
...@@ -7,37 +7,24 @@ using UnityEngine; ...@@ -7,37 +7,24 @@ using UnityEngine;
public class gameSceneAreaGroupHandler : gridView public class gameSceneAreaGroupHandler : gridView
{ {
public float itemWidth = 110f; //public float ItemWidth
public float itemHeight = 110f; //{
public float itemInterval = 5f; // get { return ItemWidth; }
private bool isInit = false; //}
private float scale = 1; //public float ItemHeight
public float ItemWidth //{
{ // get { return itemHeight; }
get { return ItemWidth; } //}
} //public float ItemInterval
public float ItemHeight //{
{ // get { return itemInterval; }
get { return itemHeight; } //}
}
public float ItemInterval
{
get { return itemInterval; }
}
// Start is called before the first frame update // Start is called before the first frame update
void Start() void Start()
{ {
if (isInit == true) return; RectTransform rectTransform = transform.parent.Find("bg").GetComponent<RectTransform>();
isInit = true; utilsTools.DisplaySize = new Vector2(rectTransform.rect.width,rectTransform.rect.height);
RectTransform rectTransform = transform.parent.GetComponent<RectTransform>();
var nowTransform = GetComponent<RectTransform>();
utilsTools.DisplaySize = new Vector2(rectTransform.rect.width, rectTransform.rect.height);
scale = (rectTransform.rect.height / 1920f); //1920/rectTransform.rect.height;
if((itemHeight * scale) > (nowTransform.rect.height * 0.8))
{
scale = (nowTransform.rect.height * 0.8f) / itemHeight;
}
} }
// Update is called once per frame // Update is called once per frame
...@@ -45,17 +32,11 @@ public class gameSceneAreaGroupHandler : gridView ...@@ -45,17 +32,11 @@ public class gameSceneAreaGroupHandler : gridView
} }
public void setDataNoGrid(int cout, gradViewBack gradView) public void setDataNoGrid(int cout, gradViewBack gradView)
{ {
if (isInit == false) setData(cout,(GameObject obj,int idx,ListViewBackTypeEnum lvb) =>
{
Start();
}
Debug.Log(string.Format("width = {0},height={1},interval={2}", itemWidth, itemHeight, itemInterval));
setDataNoGrid(cout, itemWidth * scale, itemHeight * scale, itemInterval * scale,(GameObject obj,int idx,ListViewBackTypeEnum lvb) =>
{ {
var aa1 = obj.GetComponent<RectTransform>(); //var aa1 = obj.GetComponent<RectTransform>();
aa1.localScale = new Vector3(scale,scale); //aa1.localScale = new Vector3(scale,scale);
gradView(obj,idx,lvb); gradView(obj,idx,lvb);
}, false,null,20); });
} }
} }
...@@ -212,19 +212,25 @@ public class gameSceneLogic : MonoBehaviour, IEventHandler ...@@ -212,19 +212,25 @@ public class gameSceneLogic : MonoBehaviour, IEventHandler
} }
areaGroupList.SetActive(true); areaGroupList.SetActive(true);
if (autoSwitchGroup == false) nowidx = -1; if (autoSwitchGroup == false) nowidx = -1;
var cellSize = gridViewList.getCellSize();
gradViewBack gradView = (GameObject gobject, int idx, ListViewBackTypeEnum lvbType) => { gradViewBack gradView = (GameObject gobject, int idx, ListViewBackTypeEnum lvbType) => {
if (lvbType == ListViewBackTypeEnum.create){
var ci = gobject.GetComponent<colorItem>();
ci.resetSize(cellSize.x,cellSize.y);
}
this.onUpdateGroupGridHandler(gobject, idx, lvbType, groupInfos[idx]); this.onUpdateGroupGridHandler(gobject, idx, lvbType, groupInfos[idx]);
}; };
gridViewList.setDataNoGrid(groupInfos.Count, gradView);
gridViewList.setData(groupInfos.Count, gradView,false);
if (nowidx >= 0) if (nowidx >= 0)
{ {
maingameView.switchShowAreaGroup((short)(groupInfos[nowidx].gid), (int id, bool isOk) => { maingameView.switchShowAreaGroup((short)(groupInfos[nowidx].gid), (int id, bool isOk) => {
}); });
} }
RectTransform rectTransform1 = gridViewList.GetComponent<RectTransform>(); //RectTransform rectTransform1 = gridViewList.GetComponent<RectTransform>();
RectTransform rectTransform2 = transform.Find("tipSelectGroup").GetComponent<RectTransform>(); RectTransform rectTransform2 = transform.Find("tipSelectGroup").GetComponent<RectTransform>();
float y = (utilsTools.DisplaySize.y / 2 - rectTransform1.rect.height / 2) * -1 + rectTransform2.rect.height + 25; //float y = (utilsTools.DisplaySize.y / 2 - rectTransform1.rect.height / 2) * -1 + rectTransform2.rect.height + 25;
rectTransform2.localPosition = new Vector3(rectTransform2.localPosition.x, y); //rectTransform2.localPosition = new Vector3(rectTransform2.localPosition.x, y);
if (autoSwitchGroup == false) if (autoSwitchGroup == false)
{ {
rectTransform2.gameObject.SetActive(true); rectTransform2.gameObject.SetActive(true);
...@@ -273,11 +279,11 @@ public class gameSceneLogic : MonoBehaviour, IEventHandler ...@@ -273,11 +279,11 @@ public class gameSceneLogic : MonoBehaviour, IEventHandler
utilsTools.setGDataByKey("loadingEnd", utilsTools.getTotalMillisecond()); utilsTools.setGDataByKey("loadingEnd", utilsTools.getTotalMillisecond());
RectTransform transform1 = transform.Find("gameProgressText").GetComponent<RectTransform>(); RectTransform transform1 = transform.Find("gameProgressText").GetComponent<RectTransform>();
float offsetY = 0 - utilsTools.DisplaySize.y/2 + rectTransform.rect.yMax; float offsetY = 0 - utilsTools.DisplaySize.y/2 + rectTransform.rect.yMax;
transform1.localPosition = new Vector2(transform1.localPosition.x, offsetY + 15); //transform1.localPosition = new Vector2(transform1.localPosition.x, offsetY + 15);
transform1.gameObject.SetActive(true); transform1.gameObject.SetActive(true);
transform1 = transform.Find("gameProgress").GetComponent<RectTransform>(); transform1 = transform.Find("gameProgress").GetComponent<RectTransform>();
transform1.gameObject.SetActive(true); transform1.gameObject.SetActive(true);
transform1.localPosition = new Vector2(transform1.localPosition.x, offsetY + 35); //transform1.localPosition = new Vector2(transform1.localPosition.x, offsetY + 35);
gameShowView.GetComponent<mainGameScaleMove>().setCheckInput(); gameShowView.GetComponent<mainGameScaleMove>().setCheckInput();
gameShowView.GetComponent<mainGameView>().showTimes(); gameShowView.GetComponent<mainGameView>().showTimes();
...@@ -286,7 +292,8 @@ public class gameSceneLogic : MonoBehaviour, IEventHandler ...@@ -286,7 +292,8 @@ public class gameSceneLogic : MonoBehaviour, IEventHandler
{ {
Debug.Log("handlerLoadingPosition hand endl"); Debug.Log("handlerLoadingPosition hand endl");
transform.Find("ingameLoad/loadImg").gameObject.SetActive(true); transform.Find("ingameLoad/loadImg").gameObject.SetActive(true);
utilsTools.setGDataByKey("downGaoQingBack", utilsTools.getTotalMillisecond()); int downGaoQingback = utilsTools.getTotalMillisecond();
utilsTools.setGDataByKey("downGaoQingBack", downGaoQingback);
float width = image.sprite.texture.width; float width = image.sprite.texture.width;
float height = image.sprite.texture.height; float height = image.sprite.texture.height;
float bet = width / height; float bet = width / height;
...@@ -296,11 +303,12 @@ public class gameSceneLogic : MonoBehaviour, IEventHandler ...@@ -296,11 +303,12 @@ public class gameSceneLogic : MonoBehaviour, IEventHandler
{ {
return; return;
} }
Vector2 size = new Vector2(rectTransform.rect.width, rectTransform.rect.width * 2); Vector2 size = new Vector2(rectTransform.rect.width * 0.9f, rectTransform.rect.width * 1.8f);
var rectTransform1 = transform.Find("ingameLoad/loadingbar").GetComponent<RectTransform>(); var rectTransform1 = transform.Find("ingameLoad/loadingbar").GetComponent<RectTransform>();
float diff = rectTransform1.localPosition.y - rectTransform.localPosition.y; float diff = rectTransform1.localPosition.y - rectTransform.localPosition.y;
rectTransform.sizeDelta = size; rectTransform.sizeDelta = size;
rectTransform1.localPosition = new Vector2(0, diff - size.x/2); rectTransform.localPosition = new Vector2(0, -1060);
rectTransform1.localPosition = new Vector2(0, -1200);
rectTransform1.sizeDelta = new Vector2(rectTransform1.sizeDelta.x, 35f); rectTransform1.sizeDelta = new Vector2(rectTransform1.sizeDelta.x, 35f);
} }
int onDownColorImgHandler(string id, string url, bool isSuccess, System.Object data, string localpath) int onDownColorImgHandler(string id, string url, bool isSuccess, System.Object data, string localpath)
...@@ -327,7 +335,7 @@ public class gameSceneLogic : MonoBehaviour, IEventHandler ...@@ -327,7 +335,7 @@ public class gameSceneLogic : MonoBehaviour, IEventHandler
autoSwitchGroup = Boolean.Parse(utilsTools.getGDataByKey<string>("auto_switch", autoSwitchGroup.ToString())); autoSwitchGroup = Boolean.Parse(utilsTools.getGDataByKey<string>("auto_switch", autoSwitchGroup.ToString()));
if (autoSwitchGroup == false) nowidx = -1; if (autoSwitchGroup == false) nowidx = -1;
vibration = Boolean.Parse(utilsTools.getGDataByKey<string>("vibration", vibration.ToString())); vibration = Boolean.Parse(utilsTools.getGDataByKey<string>("vibration", vibration.ToString()));
gameShowView.GetComponent<mainGameView>().loadGameImgId(); //gameShowView.GetComponent<mainGameView>().loadGameImgId();
this.handlerLoadingPosition(image); this.handlerLoadingPosition(image);
} }
return 0; return 0;
...@@ -344,36 +352,72 @@ public class gameSceneLogic : MonoBehaviour, IEventHandler ...@@ -344,36 +352,72 @@ public class gameSceneLogic : MonoBehaviour, IEventHandler
{ {
outPath = outPath.Replace("/", "\\"); outPath = outPath.Replace("/", "\\");
} }
if (utilsTools.IsExistIO(gameScenUser.getColorImgLocalPath()) == false)
{
utilsTools.setGDataByKey("beginUnZip", utilsTools.getTotalMillisecond()); utilsTools.setGDataByKey("beginUnZip", utilsTools.getTotalMillisecond());
ZipUtility.UnzipFile(zpath, outPath, "tuse" + gameScenUser.id); ZipUtility.UnzipFile(zpath, outPath, "tuse" + gameScenUser.id);
utilsTools.setGDataByKey("endUnZip", utilsTools.getTotalMillisecond()); utilsTools.setGDataByKey("endUnZip", utilsTools.getTotalMillisecond());
}
utilsTools.setGDataByKey("nowSelectUseData", gameScenUser); utilsTools.setGDataByKey("nowSelectUseData", gameScenUser);
Image image = transform.Find("ingameLoad/loadImg").GetComponent<Image>();
image.color = new Color(1, 1, 1, 0);//未加载出来时候就透明化
string lineImg = gameScenUser.getLineImgLocalPath(); string lineImg = gameScenUser.getLineImgLocalPath();
utilsTools.setGDataByKey("downGaoQing", utilsTools.getTotalMillisecond()); utilsTools.setGDataByKey("downGaoQing", utilsTools.getTotalMillisecond());
gameShowView.GetComponent<mainGameView>().loadGameImgId();
if (utilsTools.IsExistIO(lineImg) == false) if (utilsTools.IsExistIO(lineImg) == false)
{ {
utilsTools.httpDOWNIMG(this, gameScenUser.img, lineImg, (string id, string url, bool isSuccess, System.Object data) => //utilsTools.httpDOWNIMG(this, gameScenUser.img, lineImg, (string id, string url, bool isSuccess, System.Object data) =>
{ //{
return onDownColorImgHandler(id, url, isSuccess, data, lineImg); // return onDownColorImgHandler(id, url, isSuccess, data, lineImg);
}); //});
} }
else else
{ {
gameShowView.GetComponent<mainGameView>().loadGameImgId();
//if (utilsTools.IsExistIO(suoluetu) == false)
//{
// //utilsTools.loadLocalImage(this, image, lineImg, (bool isOk) =>
// //{
// // if (isOk)
// // {
// // Debug.Log("sdfdsfds " + (utilsTools.getTotalMillisecond() - temp1).ToSafeString());
// // image.color = Color.white;
// // handlerLoadingPosition(image);
// // }
// //});
//}
//else
//{
// int temp1 = utilsTools.getTotalMillisecond();
// utilsTools.loadLocalImage(this, image, suoluetu, (bool isOk) =>
// {
// if (isOk)
// {
// Debug.Log("sdfdsfds " + (utilsTools.getTotalMillisecond() - temp1).ToSafeString());
// image.color = Color.white;
// handlerLoadingPosition(image);
// }
// });
//}
}
}
void onInitViewShowDataEvent(List<UnityEngine.Object> uobjects, List<System.Object> objects)
{
utilsTools.setGDataByKey("firstT", utilsTools.getTotalMillisecond());
GameScenUserInfo gameScenUser = (GameScenUserInfo)objects[0];
string zpath = utilsTools.getWritableByPath("outFiles/" + gameScenUser.id+".zip");
if (utilsTools.IsPhone == false)
zpath = zpath.Replace("/", "\\");
string suoluetu = gameScenUser.getLocalThumbnailPath(); string suoluetu = gameScenUser.getLocalThumbnailPath();
Image image = transform.Find("ingameLoad/loadImg").GetComponent<Image>();
image.color = new Color(1, 1, 1, 0);//未加载出来时候就透明化
if (utilsTools.IsExistIO(suoluetu) == false) if (utilsTools.IsExistIO(suoluetu) == false)
{ {
utilsTools.loadLocalImage(this, image, lineImg, (bool isOk) => utilsTools.httpDOWNIMG(this, gameScenUser.thumbnailUrl, suoluetu, (string id, string url, bool isSuccess, System.Object data) =>
{ {
if (isOk) return onDownColorImgHandler(id, url, isSuccess, data, suoluetu);
{
image.color = Color.white;
handlerLoadingPosition(image);
}
}); });
} }
else else
...@@ -387,22 +431,11 @@ public class gameSceneLogic : MonoBehaviour, IEventHandler ...@@ -387,22 +431,11 @@ public class gameSceneLogic : MonoBehaviour, IEventHandler
} }
}); });
} }
}
}
void onInitViewShowDataEvent(List<UnityEngine.Object> uobjects, List<System.Object> objects)
{
utilsTools.setGDataByKey("firstT", utilsTools.getTotalMillisecond());
GameScenUserInfo gameScenUser = (GameScenUserInfo)objects[0];
string zpath = utilsTools.getWritableByPath("outFiles/" + gameScenUser.id+".zip");
if (utilsTools.IsPhone == false)
zpath = zpath.Replace("/", "\\");
if (utilsTools.IsExistIO(zpath) == false) if (utilsTools.IsExistIO(zpath) == false)
{ {
string dir1 = utilsTools.getWritableByPath("outFiles"); string dir1 = utilsTools.getWritableByPath("outFiles");
utilsTools.CreateDirectory(dir1); utilsTools.CreateDirectory(dir1);
utilsTools.setGDataByKey("downZipBegin", utilsTools.getTotalMillisecond()); utilsTools.setGDataByKey("downZipBegin", utilsTools.getTotalMillisecond());
//https://cdn.zhangxingames.com/file/ccNO7LSXpxA8GzQUHq1.zip in
//"https://d21z6ifg4bbv2v.cloudfront.net/files/ccNO7LSXpxA8GzQUHq1.zip" wwww
StartCoroutine(LoadAndBytesUnzipWithWeb(gameScenUser.file, zpath,(bool isOk) => StartCoroutine(LoadAndBytesUnzipWithWeb(gameScenUser.file, zpath,(bool isOk) =>
{ {
if (isOk) if (isOk)
...@@ -491,10 +524,16 @@ public class gameSceneLogic : MonoBehaviour, IEventHandler ...@@ -491,10 +524,16 @@ public class gameSceneLogic : MonoBehaviour, IEventHandler
}else }else
groupInfos.RemoveAt(nowidx); groupInfos.RemoveAt(nowidx);
//切换组 //切换组
Vector2 size = gridViewList.getCellSize();
gradViewBack gradView = (GameObject gobject, int idx, ListViewBackTypeEnum lvbType) => { gradViewBack gradView = (GameObject gobject, int idx, ListViewBackTypeEnum lvbType) => {
if(lvbType == ListViewBackTypeEnum.create)
{
var gagi = gameObject.GetComponent<colorItem>();
gagi.resetSize(size.x, size.y);
}
this.onUpdateGroupGridHandler(gobject, idx, lvbType, groupInfos[idx]); this.onUpdateGroupGridHandler(gobject, idx, lvbType, groupInfos[idx]);
}; };
gridViewList.setDataNoGrid(groupInfos.Count, gradView); gridViewList.setData(groupInfos.Count, gradView,false);
//震动 //震动
if (vibration) if (vibration)
{ {
...@@ -521,11 +560,15 @@ public class gameSceneLogic : MonoBehaviour, IEventHandler ...@@ -521,11 +560,15 @@ public class gameSceneLogic : MonoBehaviour, IEventHandler
} }
public void onCloseGameSceneEvent(List<UnityEngine.Object> uobjects, List<System.Object> objects) public void onCloseGameSceneEvent(List<UnityEngine.Object> uobjects, List<System.Object> objects)
{ {
utilsTools.sendEvent("CloseScenePrve");
utilsTools.addTimer_Update(gameObject, "close", (String name) =>
{
gameShowView.GetComponent<mainGameView>().onClear(); gameShowView.GetComponent<mainGameView>().onClear();
//SceneManager.LoadScene("Scenes/MainHallGame");
utilsTools.setGDataByKey("NativeTempData", "main"); utilsTools.setGDataByKey("NativeTempData", "main");
SceneManager.LoadScene("Scenes/MainGame"); SceneManager.LoadScene("Scenes/MainGame");
return false;
}, 20);
} }
public void onTestTemp1() public void onTestTemp1()
{ {
......
...@@ -21,6 +21,7 @@ public class gameUserInfos : MonoBehaviour, IEventHandler ...@@ -21,6 +21,7 @@ public class gameUserInfos : MonoBehaviour, IEventHandler
onEvent("showAreaEventOk", onSelectAreaEvent); onEvent("showAreaEventOk", onSelectAreaEvent);
onEvent("showAreaPalyerEnd", onShowAreaPalyerEndEvent); onEvent("showAreaPalyerEnd", onShowAreaPalyerEndEvent);
onEvent("inGameLoadingBarEnd", onInGameLoadingBarEndEvent); onEvent("inGameLoadingBarEnd", onInGameLoadingBarEndEvent);
onEvent("CloseScenePrve", onCloseScenePrveHandler);
utilsTools.addTimer_Update(gameObject, "first", (string name) => utilsTools.addTimer_Update(gameObject, "first", (string name) =>
{ {
if (utilsTools.ContainsKeyGDataByKey("NativeGameData") == false) if (utilsTools.ContainsKeyGDataByKey("NativeGameData") == false)
...@@ -36,7 +37,21 @@ public class gameUserInfos : MonoBehaviour, IEventHandler ...@@ -36,7 +37,21 @@ public class gameUserInfos : MonoBehaviour, IEventHandler
return false; return false;
} }
utilsTools.setGameScenUserInfo(jsonData.id, jsonData.getLineUrl(), jsonData.getColorUrl(), jsonData.getJsonUrl(), jsonData.file); utilsTools.setGameScenUserInfo(jsonData.id, jsonData.getLineUrl(), jsonData.getColorUrl(), jsonData.getJsonUrl(), jsonData.file);
startId(jsonData.id); startId(jsonData.id,jsonData);
utilsTools.httpGET(this, "{0}/app/v1/game/ts/imgSchedule?zygt=hzwz&tgtk=1&imgId={1}&uid={2}", true, (string id, string url, bool isSuccess, System.Object data) =>
{
if(isSuccess)
{
HistoryClick historyClick = JsonUtility.FromJson<HistoryClick>(data as string);
string history = historyClick.getHistory();
gameScenUserInfo.setShowAreaids(history);
return 0;
}
else
{
return 1;
}
},utilsTools.getGDataByKey<String>("urlRoot",""),jsonData.sid,utilsTools.getGDataByKey<String>("uid",""));
} }
return false; return false;
}, 2); }, 2);
...@@ -67,13 +82,17 @@ public class gameUserInfos : MonoBehaviour, IEventHandler ...@@ -67,13 +82,17 @@ public class gameUserInfos : MonoBehaviour, IEventHandler
void Update() void Update()
{ {
} }
public void startId(string id) public void startId(string id,netLableImageItem jsondata = null)
{ {
GameScenUserInfo gameScenUser = utilsTools.getGameScenUserInfo(id); GameScenUserInfo gameScenUser = utilsTools.getGameScenUserInfo(id);
if(gameScenUser == null) if(gameScenUser == null)
{ {
return; return;
} }
if(jsondata != null)
{
gameScenUser.thumbnailUrl = jsondata.getSmallLineUrl();
}
utilsTools.sendEventObjectParams("initViewShowData", gameScenUser); utilsTools.sendEventObjectParams("initViewShowData", gameScenUser);
gameScenUserInfo = gameScenUser; gameScenUserInfo = gameScenUser;
} }
...@@ -120,6 +139,15 @@ public class gameUserInfos : MonoBehaviour, IEventHandler ...@@ -120,6 +139,15 @@ public class gameUserInfos : MonoBehaviour, IEventHandler
int now = Convert.ToInt32(gameScenUserInfo.areaInfoUseData.Count / allAreaSize * 100); int now = Convert.ToInt32(gameScenUserInfo.areaInfoUseData.Count / allAreaSize * 100);
utilsTools.sendEventObjectParams("changeGameUserProgress", now); utilsTools.sendEventObjectParams("changeGameUserProgress", now);
} }
void onCloseScenePrveHandler(List<UnityEngine.Object> uobject,List<System.Object> objects)
{
if (gameScenUserInfo != null)
{
utilsTools.saveGameScenUserInfo(gameScenUserInfo);
updateProgress();
gameScenUserInfo = null;//直接释放如果期间没有保存,就一起丢失
}
}
public void updateProgress() public void updateProgress()
{ {
String urlRoot = utilsTools.getGDataByKey<String>("urlRoot", ""); String urlRoot = utilsTools.getGDataByKey<String>("urlRoot", "");
...@@ -147,8 +175,10 @@ public class gameUserInfos : MonoBehaviour, IEventHandler ...@@ -147,8 +175,10 @@ public class gameUserInfos : MonoBehaviour, IEventHandler
utilsTools.httpPOST(this, url, jsonParam, true,back); utilsTools.httpPOST(this, url, jsonParam, true,back);
} }
public void OnDestroy() public void OnDestroy()
{ {
if(gameScenUserInfo != null) if(gameScenUserInfo != null)
{ {
utilsTools.saveGameScenUserInfo(gameScenUserInfo); utilsTools.saveGameScenUserInfo(gameScenUserInfo);
......
...@@ -45,6 +45,17 @@ public class gridView : MonoBehaviour ...@@ -45,6 +45,17 @@ public class gridView : MonoBehaviour
var gameObjectContext = GetComponent<ScrollRect>(); var gameObjectContext = GetComponent<ScrollRect>();
gameObjectContext.normalizedPosition = vector2; gameObjectContext.normalizedPosition = vector2;
} }
virtual public Vector2 getCellSize()
{
Vector2 vector2 = new Vector2();
GameObject gameObjectContext = GetComponent<ScrollRect>().content.gameObject;
var gridLayout = gameObjectContext.GetComponent<GridLayoutGroup>();
if(gridLayout != null )
{
vector2 = gridLayout.cellSize;
}
return vector2;
}
virtual public void setData(int size,gradViewBack back,bool useVec = true, GetGradViewInfo getGradViewInfo = null) virtual public void setData(int size,gradViewBack back,bool useVec = true, GetGradViewInfo getGradViewInfo = null)
{ {
if (perfabPaths.Count == 0) if (perfabPaths.Count == 0)
......
...@@ -457,8 +457,19 @@ public class mainGameView : MonoBehaviour ...@@ -457,8 +457,19 @@ public class mainGameView : MonoBehaviour
if(areaIdBase != null) if(areaIdBase != null)
{ {
colorTexure2d = colorImg.GetComponent<Image>().sprite.texture; colorTexure2d = colorImg.GetComponent<Image>().sprite.texture;
thumbnailTexture2d = new Texture2D(gameidJsondata.width, gameidJsondata.height, TextureFormat.RGB24,false); if (gameidJsondata == null)
allColor.Add("color",colorTexure2d.GetPixels(0,0,colorTexure2d.width,colorTexure2d.height)); {
TaskManages.getInstance().addTask(this, (System.Object[] _) =>
{
thumbnailTexture2d = new Texture2D(gameidJsondata.width, gameidJsondata.height, TextureFormat.RGB24, false);
allColor.Add("color", colorTexure2d.GetPixels(0, 0, colorTexure2d.width, colorTexure2d.height));
return;
});
}
else {
thumbnailTexture2d = new Texture2D(gameidJsondata.width, gameidJsondata.height, TextureFormat.RGB24, false);
allColor.Add("color", colorTexure2d.GetPixels(0, 0, colorTexure2d.width, colorTexure2d.height));
}
} }
} }
} }
......
...@@ -161,7 +161,12 @@ public class colorItem : MonoBehaviour ...@@ -161,7 +161,12 @@ public class colorItem : MonoBehaviour
} }
public void resetSize(float x,float y) public void resetSize(float x,float y)
{ {
RectTransform rectTransform = GetComponent<RectTransform>(); //RectTransform rectTransform = GetComponent<RectTransform>();
rectTransform.localScale = new Vector3 (100f/x,100f/y, 1); //rectTransform.localScale = new Vector3 (100f/x,100f/y, 1);
int cout = transform.childCount;
for (int i = 0; i < cout; i++)
{
//transform.GetChild(i).localScale= new Vector3(x/100f, y/100f, 1);
}
} }
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment