fix update
parent
dd8c8d6400
commit
11773bfebd
|
@ -117,13 +117,9 @@ MonoBehaviour:
|
|||
feedbackFileIds:
|
||||
problemAnswerRespList: []
|
||||
linkRedirectRespList:
|
||||
<<<<<<< HEAD
|
||||
imgShowObj: {fileID: 1741795270303085139}
|
||||
imgShowPanel: {fileID: 8428441481117132617}
|
||||
imgShowInfo: {fileID: 3714107511326740620}
|
||||
=======
|
||||
bg: {fileID: 0}
|
||||
>>>>>>> f7d047a43985d8f30df80a230201c233e8660fd1
|
||||
--- !u!114 &8691678833329208332
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
|
@ -138,7 +134,6 @@ MonoBehaviour:
|
|||
m_EditorClassIdentifier:
|
||||
m_HorizontalFit: 0
|
||||
m_VerticalFit: 2
|
||||
<<<<<<< HEAD
|
||||
--- !u!114 &2602439114668189675
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
|
@ -165,8 +160,6 @@ MonoBehaviour:
|
|||
m_ChildScaleWidth: 0
|
||||
m_ChildScaleHeight: 0
|
||||
m_ReverseArrangement: 0
|
||||
=======
|
||||
>>>>>>> f7d047a43985d8f30df80a230201c233e8660fd1
|
||||
--- !u!1 &1593315271093846622
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
@ -185,11 +178,7 @@ GameObject:
|
|||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
<<<<<<< HEAD
|
||||
m_IsActive: 1
|
||||
=======
|
||||
m_IsActive: 0
|
||||
>>>>>>> f7d047a43985d8f30df80a230201c233e8660fd1
|
||||
--- !u!224 &5969769553351248475
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
|
@ -197,18 +186,13 @@ RectTransform:
|
|||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1593315271093846622}
|
||||
<<<<<<< HEAD
|
||||
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
|
||||
=======
|
||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
>>>>>>> f7d047a43985d8f30df80a230201c233e8660fd1
|
||||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children:
|
||||
- {fileID: 4994677032959215704}
|
||||
- {fileID: 716645220264676689}
|
||||
<<<<<<< HEAD
|
||||
m_Father: {fileID: 7110163252933009503}
|
||||
m_RootOrder: -1
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
|
@ -216,15 +200,6 @@ RectTransform:
|
|||
m_AnchorMax: {x: 0, y: 0}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 900, y: 150}
|
||||
=======
|
||||
m_Father: {fileID: 2375114288825070845}
|
||||
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: 250, y: -30}
|
||||
m_SizeDelta: {x: 300, y: 60}
|
||||
>>>>>>> f7d047a43985d8f30df80a230201c233e8660fd1
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &6927043301286011014
|
||||
CanvasRenderer:
|
||||
|
@ -332,7 +307,6 @@ MonoBehaviour:
|
|||
m_CaretWidth: 1
|
||||
m_ReadOnly: 0
|
||||
m_ShouldActivateOnSelect: 1
|
||||
<<<<<<< HEAD
|
||||
--- !u!1 &1741795270303085139
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
@ -441,8 +415,6 @@ MonoBehaviour:
|
|||
m_OnValueChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
=======
|
||||
>>>>>>> f7d047a43985d8f30df80a230201c233e8660fd1
|
||||
--- !u!1 &2052569123442822732
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
@ -511,17 +483,10 @@ MonoBehaviour:
|
|||
m_Calls: []
|
||||
m_FontData:
|
||||
m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
|
||||
<<<<<<< HEAD
|
||||
m_FontSize: 36
|
||||
m_FontStyle: 2
|
||||
m_BestFit: 0
|
||||
m_MinSize: 3
|
||||
=======
|
||||
m_FontSize: 14
|
||||
m_FontStyle: 2
|
||||
m_BestFit: 0
|
||||
m_MinSize: 10
|
||||
>>>>>>> f7d047a43985d8f30df80a230201c233e8660fd1
|
||||
m_MaxSize: 40
|
||||
m_Alignment: 0
|
||||
m_AlignByGeometry: 0
|
||||
|
@ -1399,17 +1364,10 @@ MonoBehaviour:
|
|||
m_Calls: []
|
||||
m_FontData:
|
||||
m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
|
||||
<<<<<<< HEAD
|
||||
m_FontSize: 36
|
||||
m_FontStyle: 0
|
||||
m_BestFit: 0
|
||||
m_MinSize: 3
|
||||
=======
|
||||
m_FontSize: 14
|
||||
m_FontStyle: 0
|
||||
m_BestFit: 0
|
||||
m_MinSize: 10
|
||||
>>>>>>> f7d047a43985d8f30df80a230201c233e8660fd1
|
||||
m_MaxSize: 40
|
||||
m_Alignment: 0
|
||||
m_AlignByGeometry: 0
|
||||
|
|
|
@ -37,11 +37,7 @@ RectTransform:
|
|||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
<<<<<<< HEAD
|
||||
m_AnchoredPosition: {x: 928, y: -510}
|
||||
=======
|
||||
m_AnchoredPosition: {x: 110, y: -20}
|
||||
>>>>>>> f7d047a43985d8f30df80a230201c233e8660fd1
|
||||
m_SizeDelta: {x: 200, y: 40}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &8915572443055440310
|
||||
|
@ -153,11 +149,7 @@ RectTransform:
|
|||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1481304460310455613}
|
||||
<<<<<<< HEAD
|
||||
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
|
||||
=======
|
||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
>>>>>>> f7d047a43985d8f30df80a230201c233e8660fd1
|
||||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_ConstrainProportionsScale: 0
|
||||
|
@ -167,13 +159,8 @@ RectTransform:
|
|||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||
<<<<<<< HEAD
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 318, y: 82}
|
||||
=======
|
||||
m_AnchoredPosition: {x: 261.9, y: -40.9}
|
||||
m_SizeDelta: {x: 150, y: 27}
|
||||
>>>>>>> f7d047a43985d8f30df80a230201c233e8660fd1
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &2293049432876710597
|
||||
CanvasRenderer:
|
||||
|
@ -203,13 +190,8 @@ MonoBehaviour:
|
|||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
<<<<<<< HEAD
|
||||
m_Sprite: {fileID: 21300000, guid: 5c6d8e583c689464c9eb24b5ebda4eee, type: 3}
|
||||
m_Type: 0
|
||||
=======
|
||||
m_Sprite: {fileID: 21300000, guid: 3e38c57447e811043b9e50f5d4c22ede, type: 3}
|
||||
m_Type: 1
|
||||
>>>>>>> f7d047a43985d8f30df80a230201c233e8660fd1
|
||||
m_PreserveAspect: 0
|
||||
m_FillCenter: 1
|
||||
m_FillMethod: 4
|
||||
|
@ -238,11 +220,7 @@ MonoBehaviour:
|
|||
m_ChildAlignment: 0
|
||||
m_StartCorner: 0
|
||||
m_StartAxis: 0
|
||||
<<<<<<< HEAD
|
||||
m_CellSize: {x: 300, y: 80}
|
||||
=======
|
||||
m_CellSize: {x: 200, y: 40}
|
||||
>>>>>>> f7d047a43985d8f30df80a230201c233e8660fd1
|
||||
m_Spacing: {x: 0, y: 0}
|
||||
m_Constraint: 0
|
||||
m_ConstraintCount: 2
|
||||
|
@ -291,24 +269,14 @@ RectTransform:
|
|||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_ConstrainProportionsScale: 0
|
||||
<<<<<<< HEAD
|
||||
m_Children: []
|
||||
=======
|
||||
m_Children:
|
||||
- {fileID: 4849437457894997419}
|
||||
>>>>>>> f7d047a43985d8f30df80a230201c233e8660fd1
|
||||
m_Father: {fileID: 2789738623178502501}
|
||||
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}
|
||||
<<<<<<< HEAD
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 284, y: 100}
|
||||
=======
|
||||
m_AnchoredPosition: {x: 104, y: -40.9}
|
||||
m_SizeDelta: {x: 150, y: 27}
|
||||
>>>>>>> f7d047a43985d8f30df80a230201c233e8660fd1
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &8290195468111767080
|
||||
CanvasRenderer:
|
||||
|
@ -368,11 +336,7 @@ MonoBehaviour:
|
|||
m_ChildAlignment: 0
|
||||
m_StartCorner: 0
|
||||
m_StartAxis: 0
|
||||
<<<<<<< HEAD
|
||||
m_CellSize: {x: 260, y: 40}
|
||||
=======
|
||||
m_CellSize: {x: 200, y: 40}
|
||||
>>>>>>> f7d047a43985d8f30df80a230201c233e8660fd1
|
||||
m_Spacing: {x: 0, y: 0}
|
||||
m_Constraint: 0
|
||||
m_ConstraintCount: 2
|
||||
|
@ -716,11 +680,8 @@ RectTransform:
|
|||
- {fileID: 5682881571846232743}
|
||||
- {fileID: 191487164380169313}
|
||||
- {fileID: 6947030436409901014}
|
||||
<<<<<<< HEAD
|
||||
- {fileID: 4849437457894997419}
|
||||
- {fileID: 3186753587272614733}
|
||||
=======
|
||||
>>>>>>> f7d047a43985d8f30df80a230201c233e8660fd1
|
||||
m_Father: {fileID: 0}
|
||||
m_RootOrder: -1
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
|
@ -784,7 +745,4 @@ MonoBehaviour:
|
|||
morePanel: {fileID: 191487164380169313}
|
||||
moreBtn: {fileID: 4183605377818282346}
|
||||
morePanel2: {fileID: 6947030436409901014}
|
||||
<<<<<<< HEAD
|
||||
posParent: {fileID: 5682881571846232743}
|
||||
=======
|
||||
>>>>>>> f7d047a43985d8f30df80a230201c233e8660fd1
|
||||
|
|
|
@ -157,10 +157,10 @@ RectTransform:
|
|||
m_Father: {fileID: 968591189907406642}
|
||||
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: 150, y: -550}
|
||||
m_SizeDelta: {x: 300, y: 100}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 0, y: 0}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 0, y: 0}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &1924684962948330109
|
||||
CanvasRenderer:
|
||||
|
@ -850,11 +850,7 @@ MonoBehaviour:
|
|||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Material: {fileID: 0}
|
||||
<<<<<<< HEAD
|
||||
m_Color: {r: 0.020692414, g: 0.79715204, b: 0.8773585, a: 0.46666667}
|
||||
=======
|
||||
m_Color: {r: 0.020692414, g: 0.79715204, b: 0.8773585, a: 1}
|
||||
>>>>>>> f7d047a43985d8f30df80a230201c233e8660fd1
|
||||
m_RaycastTarget: 1
|
||||
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
|
||||
m_Maskable: 1
|
||||
|
@ -911,11 +907,7 @@ RectTransform:
|
|||
m_AnchorMin: {x: 1, y: 1}
|
||||
m_AnchorMax: {x: 1, y: 1}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
<<<<<<< HEAD
|
||||
m_SizeDelta: {x: 200, y: 50}
|
||||
=======
|
||||
m_SizeDelta: {x: 150, y: 50}
|
||||
>>>>>>> f7d047a43985d8f30df80a230201c233e8660fd1
|
||||
m_Pivot: {x: 1, y: 1}
|
||||
--- !u!222 &6632334344522383415
|
||||
CanvasRenderer:
|
||||
|
@ -945,13 +937,8 @@ MonoBehaviour:
|
|||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
<<<<<<< HEAD
|
||||
m_Sprite: {fileID: 21300000, guid: 7a9407de6aae46646a6e24004a2495fd, type: 3}
|
||||
m_Type: 0
|
||||
=======
|
||||
m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0}
|
||||
m_Type: 1
|
||||
>>>>>>> f7d047a43985d8f30df80a230201c233e8660fd1
|
||||
m_PreserveAspect: 0
|
||||
m_FillCenter: 1
|
||||
m_FillMethod: 4
|
||||
|
@ -2021,10 +2008,7 @@ GameObject:
|
|||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 2247403716701697365}
|
||||
<<<<<<< HEAD
|
||||
- component: {fileID: 3867324659097414014}
|
||||
=======
|
||||
>>>>>>> f7d047a43985d8f30df80a230201c233e8660fd1
|
||||
m_Layer: 5
|
||||
m_Name: Content
|
||||
m_TagString: Untagged
|
||||
|
@ -2053,7 +2037,6 @@ RectTransform:
|
|||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 0, y: 28}
|
||||
m_Pivot: {x: 0.5, y: 1}
|
||||
<<<<<<< HEAD
|
||||
--- !u!114 &3867324659097414014
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
|
@ -2080,8 +2063,6 @@ MonoBehaviour:
|
|||
m_ChildScaleWidth: 0
|
||||
m_ChildScaleHeight: 0
|
||||
m_ReverseArrangement: 0
|
||||
=======
|
||||
>>>>>>> f7d047a43985d8f30df80a230201c233e8660fd1
|
||||
--- !u!1 &3499748536273924326
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
@ -4143,11 +4124,7 @@ MonoBehaviour:
|
|||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Material: {fileID: 0}
|
||||
<<<<<<< HEAD
|
||||
m_Color: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 0}
|
||||
=======
|
||||
m_Color: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
|
||||
>>>>>>> f7d047a43985d8f30df80a230201c233e8660fd1
|
||||
m_RaycastTarget: 1
|
||||
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
|
||||
m_Maskable: 1
|
||||
|
@ -4604,11 +4581,7 @@ RectTransform:
|
|||
m_AnchorMin: {x: 0, y: 0.5}
|
||||
m_AnchorMax: {x: 1, y: 0.5}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
<<<<<<< HEAD
|
||||
m_SizeDelta: {x: 0, y: 60}
|
||||
=======
|
||||
m_SizeDelta: {x: 0, y: 20}
|
||||
>>>>>>> f7d047a43985d8f30df80a230201c233e8660fd1
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!114 &4683198212453877958
|
||||
MonoBehaviour:
|
||||
|
@ -4694,11 +4667,7 @@ RectTransform:
|
|||
m_AnchorMin: {x: 0, y: 0.5}
|
||||
m_AnchorMax: {x: 0, y: 0.5}
|
||||
m_AnchoredPosition: {x: 10, y: 0}
|
||||
<<<<<<< HEAD
|
||||
m_SizeDelta: {x: 40, y: 40}
|
||||
=======
|
||||
m_SizeDelta: {x: 20, y: 20}
|
||||
>>>>>>> f7d047a43985d8f30df80a230201c233e8660fd1
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &6793026810084184322
|
||||
CanvasRenderer:
|
||||
|
@ -4773,10 +4742,10 @@ RectTransform:
|
|||
m_Father: {fileID: 968591189907406642}
|
||||
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: 150, y: -650}
|
||||
m_SizeDelta: {x: 300, y: 100}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 0, y: 0}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 0, y: 0}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &5333052486880390099
|
||||
CanvasRenderer:
|
||||
|
@ -5030,13 +4999,8 @@ RectTransform:
|
|||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 1, y: 0.5}
|
||||
m_AnchorMax: {x: 1, y: 0.5}
|
||||
<<<<<<< HEAD
|
||||
m_AnchoredPosition: {x: -23.1, y: 0}
|
||||
m_SizeDelta: {x: 26, y: 14}
|
||||
=======
|
||||
m_AnchoredPosition: {x: -15, y: 0}
|
||||
m_SizeDelta: {x: 20, y: 20}
|
||||
>>>>>>> f7d047a43985d8f30df80a230201c233e8660fd1
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &1850039632980858358
|
||||
CanvasRenderer:
|
||||
|
@ -5066,11 +5030,7 @@ MonoBehaviour:
|
|||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
<<<<<<< HEAD
|
||||
m_Sprite: {fileID: 21300000, guid: 0630133e1cbdf464d84ef898008ab446, type: 3}
|
||||
=======
|
||||
m_Sprite: {fileID: 10915, guid: 0000000000000000f000000000000000, type: 0}
|
||||
>>>>>>> f7d047a43985d8f30df80a230201c233e8660fd1
|
||||
m_Type: 0
|
||||
m_PreserveAspect: 0
|
||||
m_FillCenter: 1
|
||||
|
@ -5330,10 +5290,10 @@ RectTransform:
|
|||
m_Father: {fileID: 968591189907406642}
|
||||
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: 150, y: -50}
|
||||
m_SizeDelta: {x: 300, y: 100}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 0, y: 0}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 0, y: 0}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &4445425826277105834
|
||||
CanvasRenderer:
|
||||
|
@ -5722,10 +5682,10 @@ RectTransform:
|
|||
m_Father: {fileID: 968591189907406642}
|
||||
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: 150, y: -150}
|
||||
m_SizeDelta: {x: 300, y: 100}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 0, y: 0}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 0, y: 0}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &2718563229004736591
|
||||
CanvasRenderer:
|
||||
|
@ -6078,10 +6038,7 @@ GameObject:
|
|||
- component: {fileID: 4861220468829710616}
|
||||
- component: {fileID: 6093983534376275030}
|
||||
- component: {fileID: 5665538986554622549}
|
||||
<<<<<<< HEAD
|
||||
- component: {fileID: 4778837651746600147}
|
||||
=======
|
||||
>>>>>>> f7d047a43985d8f30df80a230201c233e8660fd1
|
||||
m_Layer: 5
|
||||
m_Name: Template
|
||||
m_TagString: Untagged
|
||||
|
@ -6139,13 +6096,8 @@ MonoBehaviour:
|
|||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
<<<<<<< HEAD
|
||||
m_Sprite: {fileID: 21300000, guid: f4226af9661289c45aaaab6e209d6224, type: 3}
|
||||
m_Type: 0
|
||||
=======
|
||||
m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0}
|
||||
m_Type: 1
|
||||
>>>>>>> f7d047a43985d8f30df80a230201c233e8660fd1
|
||||
m_PreserveAspect: 0
|
||||
m_FillCenter: 1
|
||||
m_FillMethod: 4
|
||||
|
@ -6184,7 +6136,6 @@ MonoBehaviour:
|
|||
m_OnValueChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
<<<<<<< HEAD
|
||||
--- !u!114 &4778837651746600147
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
|
@ -6199,8 +6150,6 @@ MonoBehaviour:
|
|||
m_EditorClassIdentifier:
|
||||
m_HorizontalFit: 0
|
||||
m_VerticalFit: 2
|
||||
=======
|
||||
>>>>>>> f7d047a43985d8f30df80a230201c233e8660fd1
|
||||
--- !u!1 &7205288802661291749
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
@ -6236,10 +6185,10 @@ RectTransform:
|
|||
m_Father: {fileID: 968591189907406642}
|
||||
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: 150, y: -350}
|
||||
m_SizeDelta: {x: 300, y: 100}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 0, y: 0}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 0, y: 0}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &7760421478684585830
|
||||
CanvasRenderer:
|
||||
|
@ -6851,10 +6800,10 @@ RectTransform:
|
|||
m_Father: {fileID: 968591189907406642}
|
||||
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: 150, y: -450}
|
||||
m_SizeDelta: {x: 300, y: 100}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 0, y: 0}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 0, y: 0}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &7324259017731310892
|
||||
CanvasRenderer:
|
||||
|
@ -7407,10 +7356,10 @@ RectTransform:
|
|||
m_Father: {fileID: 968591189907406642}
|
||||
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: 150, y: -250}
|
||||
m_SizeDelta: {x: 300, y: 100}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 0, y: 0}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 0, y: 0}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &7774789612886221893
|
||||
CanvasRenderer:
|
||||
|
|
|
@ -122,7 +122,7 @@ public class QuestionItem : MonoBehaviour
|
|||
//±£´æ±¾µØ
|
||||
//Byte[] bytes = tex.EncodeToPNG();
|
||||
//File.WriteAllBytes(Application.dataPath + "/" + data.name + ".png", bytes);
|
||||
if (hintTxt != null)
|
||||
if (tex != null)
|
||||
{
|
||||
Sprite sprite = Sprite.Create(tex, new Rect(0, 0, tex.width, tex.height), new Vector2(0.5f, 0.5f));
|
||||
img.GetComponent<Image>().sprite = sprite;
|
||||
|
|
|
@ -22,8 +22,8 @@ public class UICheckTest : UIBase
|
|||
EventCenter.dispatcher.AddListener(MsgType.OnSubmitQuestion, OnSubmitQuestion);
|
||||
questionPrefab = (GameObject)Resources.Load("UIPrefabs/Question");
|
||||
|
||||
RefreshData();
|
||||
EventCenter.dispatcher.AddListener(MsgType.OnGetPeopleQuetionList, RefreshData);
|
||||
RefreshData();
|
||||
}
|
||||
|
||||
public void RefreshData(Message evt = null)
|
||||
|
@ -74,6 +74,7 @@ public class UICheckTest : UIBase
|
|||
return;
|
||||
}
|
||||
}
|
||||
}
|
||||
//ÆäÓàÕý³£ÏÔʾÎÊÌâ
|
||||
switch (questionType)
|
||||
{
|
||||
|
@ -136,7 +137,6 @@ public class UICheckTest : UIBase
|
|||
|
||||
}
|
||||
|
||||
}
|
||||
private void OnSubmitQuestion(Message evt)
|
||||
{
|
||||
bool isAllFinish = false;
|
||||
|
|
|
@ -495,6 +495,7 @@ public class UITalkMain : UIBase
|
|||
|
||||
string url = string.Format("http://122.112.171.137:85/api/problem/answer/getProblemByBackgroundCode/{0}/{1}", DataManager.Instance.currentData.id,
|
||||
(int)DataManager.Instance.currentQuesitionType);
|
||||
Debug.Log(url);
|
||||
StartCoroutine(Get(url));
|
||||
}
|
||||
|
||||
|
|
Binary file not shown.
File diff suppressed because one or more lines are too long
Binary file not shown.
|
@ -37245,11 +37245,7 @@
|
|||
"DisplayName": "Writing Assembly-CSharp.rsp",
|
||||
"ActionType": "WriteFile",
|
||||
"PayloadOffset": 2582811,
|
||||
<<<<<<< HEAD
|
||||
"PayloadLength": 32997,
|
||||
=======
|
||||
"PayloadLength": 32964,
|
||||
>>>>>>> f7d047a43985d8f30df80a230201c233e8660fd1
|
||||
"PayloadDebugContentSnippet": "-target:library\r\n-out:\"Library",
|
||||
"Inputs": [],
|
||||
"Outputs": [
|
||||
|
@ -37261,11 +37257,7 @@
|
|||
"Annotation": "WriteText Library/Bee/artifacts/1900b0aEDbg.dag/Assembly-CSharp.rsp2",
|
||||
"DisplayName": "Writing Assembly-CSharp.rsp2",
|
||||
"ActionType": "WriteFile",
|
||||
<<<<<<< HEAD
|
||||
"PayloadOffset": 2615898,
|
||||
=======
|
||||
"PayloadOffset": 2615865,
|
||||
>>>>>>> f7d047a43985d8f30df80a230201c233e8660fd1
|
||||
"PayloadLength": 0,
|
||||
"PayloadDebugContentSnippet": "",
|
||||
"Inputs": [],
|
||||
|
@ -37659,11 +37651,7 @@
|
|||
"Annotation": "WriteText Library/Bee/artifacts/1900b0aEDbg.dag/Assembly-CSharp.dll.mvfrm.rsp",
|
||||
"DisplayName": "Writing Assembly-CSharp.dll.mvfrm.rsp",
|
||||
"ActionType": "WriteFile",
|
||||
<<<<<<< HEAD
|
||||
"PayloadOffset": 2615997,
|
||||
=======
|
||||
"PayloadOffset": 2615964,
|
||||
>>>>>>> f7d047a43985d8f30df80a230201c233e8660fd1
|
||||
"PayloadLength": 11428,
|
||||
"PayloadDebugContentSnippet": "Library\\Bee\\artifacts\\mvdfrm\\U",
|
||||
"Inputs": [],
|
||||
|
@ -37956,11 +37944,7 @@
|
|||
"Annotation": "WriteResponseFile Library/Bee/artifacts/rsp/4747638433968585886.rsp",
|
||||
"DisplayName": "Writing 4747638433968585886.rsp",
|
||||
"ActionType": "WriteFile",
|
||||
<<<<<<< HEAD
|
||||
"PayloadOffset": 2627514,
|
||||
=======
|
||||
"PayloadOffset": 2627481,
|
||||
>>>>>>> f7d047a43985d8f30df80a230201c233e8660fd1
|
||||
"PayloadLength": 39545,
|
||||
"PayloadDebugContentSnippet": "\"unity-ilpp-b7d9964f7067911f69",
|
||||
"Inputs": [],
|
||||
|
@ -38359,11 +38343,7 @@
|
|||
"Annotation": "WriteResponseFile Library/Bee/artifacts/rsp/14811776502145285846.rsp",
|
||||
"DisplayName": "Writing 14811776502145285846.rsp",
|
||||
"ActionType": "WriteFile",
|
||||
<<<<<<< HEAD
|
||||
"PayloadOffset": 2667149,
|
||||
=======
|
||||
"PayloadOffset": 2667116,
|
||||
>>>>>>> f7d047a43985d8f30df80a230201c233e8660fd1
|
||||
"PayloadLength": 26739,
|
||||
"PayloadDebugContentSnippet": "\"unity-ilpp-b7d9964f7067911f69",
|
||||
"Inputs": [],
|
||||
|
@ -39349,11 +39329,7 @@
|
|||
"Annotation": "WriteResponseFile Library/Bee/artifacts/rsp/13937618220218904785.rsp",
|
||||
"DisplayName": "Writing 13937618220218904785.rsp",
|
||||
"ActionType": "WriteFile",
|
||||
<<<<<<< HEAD
|
||||
"PayloadOffset": 2693978,
|
||||
=======
|
||||
"PayloadOffset": 2693945,
|
||||
>>>>>>> f7d047a43985d8f30df80a230201c233e8660fd1
|
||||
"PayloadLength": 27946,
|
||||
"PayloadDebugContentSnippet": "\"unity-ilpp-b7d9964f7067911f69",
|
||||
"Inputs": [],
|
||||
|
@ -40469,11 +40445,7 @@
|
|||
"Annotation": "WriteResponseFile Library/Bee/artifacts/rsp/2201917535443199433.rsp",
|
||||
"DisplayName": "Writing 2201917535443199433.rsp",
|
||||
"ActionType": "WriteFile",
|
||||
<<<<<<< HEAD
|
||||
"PayloadOffset": 2722013,
|
||||
=======
|
||||
"PayloadOffset": 2721980,
|
||||
>>>>>>> f7d047a43985d8f30df80a230201c233e8660fd1
|
||||
"PayloadLength": 27960,
|
||||
"PayloadDebugContentSnippet": "\"unity-ilpp-b7d9964f7067911f69",
|
||||
"Inputs": [],
|
||||
|
@ -41591,11 +41563,7 @@
|
|||
"Annotation": "WriteResponseFile Library/Bee/artifacts/rsp/14624195337853966949.rsp",
|
||||
"DisplayName": "Writing 14624195337853966949.rsp",
|
||||
"ActionType": "WriteFile",
|
||||
<<<<<<< HEAD
|
||||
"PayloadOffset": 2750063,
|
||||
=======
|
||||
"PayloadOffset": 2750030,
|
||||
>>>>>>> f7d047a43985d8f30df80a230201c233e8660fd1
|
||||
"PayloadLength": 26768,
|
||||
"PayloadDebugContentSnippet": "\"unity-ilpp-b7d9964f7067911f69",
|
||||
"Inputs": [],
|
||||
|
@ -42713,11 +42681,7 @@
|
|||
"Annotation": "WriteResponseFile Library/Bee/artifacts/rsp/13111862135879654926.rsp",
|
||||
"DisplayName": "Writing 13111862135879654926.rsp",
|
||||
"ActionType": "WriteFile",
|
||||
<<<<<<< HEAD
|
||||
"PayloadOffset": 2776921,
|
||||
=======
|
||||
"PayloadOffset": 2776888,
|
||||
>>>>>>> f7d047a43985d8f30df80a230201c233e8660fd1
|
||||
"PayloadLength": 27955,
|
||||
"PayloadDebugContentSnippet": "\"unity-ilpp-b7d9964f7067911f69",
|
||||
"Inputs": [],
|
||||
|
@ -43835,11 +43799,7 @@
|
|||
"Annotation": "WriteResponseFile Library/Bee/artifacts/rsp/3740346636645902239.rsp",
|
||||
"DisplayName": "Writing 3740346636645902239.rsp",
|
||||
"ActionType": "WriteFile",
|
||||
<<<<<<< HEAD
|
||||
"PayloadOffset": 2804965,
|
||||
=======
|
||||
"PayloadOffset": 2804932,
|
||||
>>>>>>> f7d047a43985d8f30df80a230201c233e8660fd1
|
||||
"PayloadLength": 27956,
|
||||
"PayloadDebugContentSnippet": "\"unity-ilpp-b7d9964f7067911f69",
|
||||
"Inputs": [],
|
||||
|
@ -44957,11 +44917,7 @@
|
|||
"Annotation": "WriteResponseFile Library/Bee/artifacts/rsp/8588239998122724505.rsp",
|
||||
"DisplayName": "Writing 8588239998122724505.rsp",
|
||||
"ActionType": "WriteFile",
|
||||
<<<<<<< HEAD
|
||||
"PayloadOffset": 2833010,
|
||||
=======
|
||||
"PayloadOffset": 2832977,
|
||||
>>>>>>> f7d047a43985d8f30df80a230201c233e8660fd1
|
||||
"PayloadLength": 26770,
|
||||
"PayloadDebugContentSnippet": "\"unity-ilpp-b7d9964f7067911f69",
|
||||
"Inputs": [],
|
||||
|
@ -46079,11 +46035,7 @@
|
|||
"Annotation": "WriteResponseFile Library/Bee/artifacts/rsp/16765266549976182072.rsp",
|
||||
"DisplayName": "Writing 16765266549976182072.rsp",
|
||||
"ActionType": "WriteFile",
|
||||
<<<<<<< HEAD
|
||||
"PayloadOffset": 2859870,
|
||||
=======
|
||||
"PayloadOffset": 2859837,
|
||||
>>>>>>> f7d047a43985d8f30df80a230201c233e8660fd1
|
||||
"PayloadLength": 25445,
|
||||
"PayloadDebugContentSnippet": "\"unity-ilpp-b7d9964f7067911f69",
|
||||
"Inputs": [],
|
||||
|
@ -47201,11 +47153,7 @@
|
|||
"Annotation": "WriteResponseFile Library/Bee/artifacts/rsp/2123039382149407573.rsp",
|
||||
"DisplayName": "Writing 2123039382149407573.rsp",
|
||||
"ActionType": "WriteFile",
|
||||
<<<<<<< HEAD
|
||||
"PayloadOffset": 2885404,
|
||||
=======
|
||||
"PayloadOffset": 2885371,
|
||||
>>>>>>> f7d047a43985d8f30df80a230201c233e8660fd1
|
||||
"PayloadLength": 27962,
|
||||
"PayloadDebugContentSnippet": "\"unity-ilpp-b7d9964f7067911f69",
|
||||
"Inputs": [],
|
||||
|
@ -48323,11 +48271,7 @@
|
|||
"Annotation": "WriteResponseFile Library/Bee/artifacts/rsp/6788922209734692781.rsp",
|
||||
"DisplayName": "Writing 6788922209734692781.rsp",
|
||||
"ActionType": "WriteFile",
|
||||
<<<<<<< HEAD
|
||||
"PayloadOffset": 2913455,
|
||||
=======
|
||||
"PayloadOffset": 2913422,
|
||||
>>>>>>> f7d047a43985d8f30df80a230201c233e8660fd1
|
||||
"PayloadLength": 26780,
|
||||
"PayloadDebugContentSnippet": "\"unity-ilpp-b7d9964f7067911f69",
|
||||
"Inputs": [],
|
||||
|
@ -49445,11 +49389,7 @@
|
|||
"Annotation": "WriteResponseFile Library/Bee/artifacts/rsp/5437769195855483410.rsp",
|
||||
"DisplayName": "Writing 5437769195855483410.rsp",
|
||||
"ActionType": "WriteFile",
|
||||
<<<<<<< HEAD
|
||||
"PayloadOffset": 2940324,
|
||||
=======
|
||||
"PayloadOffset": 2940291,
|
||||
>>>>>>> f7d047a43985d8f30df80a230201c233e8660fd1
|
||||
"PayloadLength": 26764,
|
||||
"PayloadDebugContentSnippet": "\"unity-ilpp-b7d9964f7067911f69",
|
||||
"Inputs": [],
|
||||
|
@ -50567,11 +50507,7 @@
|
|||
"Annotation": "WriteResponseFile Library/Bee/artifacts/rsp/5748731363401015749.rsp",
|
||||
"DisplayName": "Writing 5748731363401015749.rsp",
|
||||
"ActionType": "WriteFile",
|
||||
<<<<<<< HEAD
|
||||
"PayloadOffset": 2967177,
|
||||
=======
|
||||
"PayloadOffset": 2967144,
|
||||
>>>>>>> f7d047a43985d8f30df80a230201c233e8660fd1
|
||||
"PayloadLength": 27974,
|
||||
"PayloadDebugContentSnippet": "\"unity-ilpp-b7d9964f7067911f69",
|
||||
"Inputs": [],
|
||||
|
@ -51689,11 +51625,7 @@
|
|||
"Annotation": "WriteResponseFile Library/Bee/artifacts/rsp/7045246832102146154.rsp",
|
||||
"DisplayName": "Writing 7045246832102146154.rsp",
|
||||
"ActionType": "WriteFile",
|
||||
<<<<<<< HEAD
|
||||
"PayloadOffset": 2995240,
|
||||
=======
|
||||
"PayloadOffset": 2995207,
|
||||
>>>>>>> f7d047a43985d8f30df80a230201c233e8660fd1
|
||||
"PayloadLength": 26774,
|
||||
"PayloadDebugContentSnippet": "\"unity-ilpp-b7d9964f7067911f69",
|
||||
"Inputs": [],
|
||||
|
@ -52811,11 +52743,7 @@
|
|||
"Annotation": "WriteResponseFile Library/Bee/artifacts/rsp/12391268863132583056.rsp",
|
||||
"DisplayName": "Writing 12391268863132583056.rsp",
|
||||
"ActionType": "WriteFile",
|
||||
<<<<<<< HEAD
|
||||
"PayloadOffset": 3022104,
|
||||
=======
|
||||
"PayloadOffset": 3022071,
|
||||
>>>>>>> f7d047a43985d8f30df80a230201c233e8660fd1
|
||||
"PayloadLength": 27954,
|
||||
"PayloadDebugContentSnippet": "\"unity-ilpp-b7d9964f7067911f69",
|
||||
"Inputs": [],
|
||||
|
@ -53933,11 +53861,7 @@
|
|||
"Annotation": "WriteResponseFile Library/Bee/artifacts/rsp/14841331992726249725.rsp",
|
||||
"DisplayName": "Writing 14841331992726249725.rsp",
|
||||
"ActionType": "WriteFile",
|
||||
<<<<<<< HEAD
|
||||
"PayloadOffset": 3050148,
|
||||
=======
|
||||
"PayloadOffset": 3050115,
|
||||
>>>>>>> f7d047a43985d8f30df80a230201c233e8660fd1
|
||||
"PayloadLength": 27984,
|
||||
"PayloadDebugContentSnippet": "\"unity-ilpp-b7d9964f7067911f69",
|
||||
"Inputs": [],
|
||||
|
@ -55055,11 +54979,7 @@
|
|||
"Annotation": "WriteResponseFile Library/Bee/artifacts/rsp/14706505386486315648.rsp",
|
||||
"DisplayName": "Writing 14706505386486315648.rsp",
|
||||
"ActionType": "WriteFile",
|
||||
<<<<<<< HEAD
|
||||
"PayloadOffset": 3078222,
|
||||
=======
|
||||
"PayloadOffset": 3078189,
|
||||
>>>>>>> f7d047a43985d8f30df80a230201c233e8660fd1
|
||||
"PayloadLength": 27994,
|
||||
"PayloadDebugContentSnippet": "\"unity-ilpp-b7d9964f7067911f69",
|
||||
"Inputs": [],
|
||||
|
@ -56177,11 +56097,7 @@
|
|||
"Annotation": "WriteResponseFile Library/Bee/artifacts/rsp/5068094731376506261.rsp",
|
||||
"DisplayName": "Writing 5068094731376506261.rsp",
|
||||
"ActionType": "WriteFile",
|
||||
<<<<<<< HEAD
|
||||
"PayloadOffset": 3106305,
|
||||
=======
|
||||
"PayloadOffset": 3106272,
|
||||
>>>>>>> f7d047a43985d8f30df80a230201c233e8660fd1
|
||||
"PayloadLength": 26764,
|
||||
"PayloadDebugContentSnippet": "\"unity-ilpp-b7d9964f7067911f69",
|
||||
"Inputs": [],
|
||||
|
@ -57299,11 +57215,7 @@
|
|||
"Annotation": "WriteResponseFile Library/Bee/artifacts/rsp/10024200538832084055.rsp",
|
||||
"DisplayName": "Writing 10024200538832084055.rsp",
|
||||
"ActionType": "WriteFile",
|
||||
<<<<<<< HEAD
|
||||
"PayloadOffset": 3133159,
|
||||
=======
|
||||
"PayloadOffset": 3133126,
|
||||
>>>>>>> f7d047a43985d8f30df80a230201c233e8660fd1
|
||||
"PayloadLength": 26786,
|
||||
"PayloadDebugContentSnippet": "\"unity-ilpp-b7d9964f7067911f69",
|
||||
"Inputs": [],
|
||||
|
@ -58421,11 +58333,7 @@
|
|||
"Annotation": "WriteResponseFile Library/Bee/artifacts/rsp/4082344215324493762.rsp",
|
||||
"DisplayName": "Writing 4082344215324493762.rsp",
|
||||
"ActionType": "WriteFile",
|
||||
<<<<<<< HEAD
|
||||
"PayloadOffset": 3160034,
|
||||
=======
|
||||
"PayloadOffset": 3160001,
|
||||
>>>>>>> f7d047a43985d8f30df80a230201c233e8660fd1
|
||||
"PayloadLength": 26850,
|
||||
"PayloadDebugContentSnippet": "\"unity-ilpp-b7d9964f7067911f69",
|
||||
"Inputs": [],
|
||||
|
@ -59543,11 +59451,7 @@
|
|||
"Annotation": "WriteResponseFile Library/Bee/artifacts/rsp/6634474554950640363.rsp",
|
||||
"DisplayName": "Writing 6634474554950640363.rsp",
|
||||
"ActionType": "WriteFile",
|
||||
<<<<<<< HEAD
|
||||
"PayloadOffset": 3186973,
|
||||
=======
|
||||
"PayloadOffset": 3186940,
|
||||
>>>>>>> f7d047a43985d8f30df80a230201c233e8660fd1
|
||||
"PayloadLength": 27998,
|
||||
"PayloadDebugContentSnippet": "\"unity-ilpp-b7d9964f7067911f69",
|
||||
"Inputs": [],
|
||||
|
@ -60667,11 +60571,7 @@
|
|||
"Annotation": "WriteResponseFile Library/Bee/artifacts/rsp/1192043025894653895.rsp",
|
||||
"DisplayName": "Writing 1192043025894653895.rsp",
|
||||
"ActionType": "WriteFile",
|
||||
<<<<<<< HEAD
|
||||
"PayloadOffset": 3215060,
|
||||
=======
|
||||
"PayloadOffset": 3215027,
|
||||
>>>>>>> f7d047a43985d8f30df80a230201c233e8660fd1
|
||||
"PayloadLength": 26832,
|
||||
"PayloadDebugContentSnippet": "\"unity-ilpp-b7d9964f7067911f69",
|
||||
"Inputs": [],
|
||||
|
@ -61791,11 +61691,7 @@
|
|||
"Annotation": "WriteResponseFile Library/Bee/artifacts/rsp/8464572559224095712.rsp",
|
||||
"DisplayName": "Writing 8464572559224095712.rsp",
|
||||
"ActionType": "WriteFile",
|
||||
<<<<<<< HEAD
|
||||
"PayloadOffset": 3241981,
|
||||
=======
|
||||
"PayloadOffset": 3241948,
|
||||
>>>>>>> f7d047a43985d8f30df80a230201c233e8660fd1
|
||||
"PayloadLength": 26844,
|
||||
"PayloadDebugContentSnippet": "\"unity-ilpp-b7d9964f7067911f69",
|
||||
"Inputs": [],
|
||||
|
@ -62915,11 +62811,7 @@
|
|||
"Annotation": "WriteResponseFile Library/Bee/artifacts/rsp/3743752087571888288.rsp",
|
||||
"DisplayName": "Writing 3743752087571888288.rsp",
|
||||
"ActionType": "WriteFile",
|
||||
<<<<<<< HEAD
|
||||
"PayloadOffset": 3268914,
|
||||
=======
|
||||
"PayloadOffset": 3268881,
|
||||
>>>>>>> f7d047a43985d8f30df80a230201c233e8660fd1
|
||||
"PayloadLength": 28027,
|
||||
"PayloadDebugContentSnippet": "\"unity-ilpp-b7d9964f7067911f69",
|
||||
"Inputs": [],
|
||||
|
@ -64039,11 +63931,7 @@
|
|||
"Annotation": "WriteResponseFile Library/Bee/artifacts/rsp/3534218543072847276.rsp",
|
||||
"DisplayName": "Writing 3534218543072847276.rsp",
|
||||
"ActionType": "WriteFile",
|
||||
<<<<<<< HEAD
|
||||
"PayloadOffset": 3297030,
|
||||
=======
|
||||
"PayloadOffset": 3296997,
|
||||
>>>>>>> f7d047a43985d8f30df80a230201c233e8660fd1
|
||||
"PayloadLength": 28099,
|
||||
"PayloadDebugContentSnippet": "\"unity-ilpp-b7d9964f7067911f69",
|
||||
"Inputs": [],
|
||||
|
@ -65165,11 +65053,7 @@
|
|||
"Annotation": "WriteResponseFile Library/Bee/artifacts/rsp/7480027478895629309.rsp",
|
||||
"DisplayName": "Writing 7480027478895629309.rsp",
|
||||
"ActionType": "WriteFile",
|
||||
<<<<<<< HEAD
|
||||
"PayloadOffset": 3325218,
|
||||
=======
|
||||
"PayloadOffset": 3325185,
|
||||
>>>>>>> f7d047a43985d8f30df80a230201c233e8660fd1
|
||||
"PayloadLength": 28007,
|
||||
"PayloadDebugContentSnippet": "\"unity-ilpp-b7d9964f7067911f69",
|
||||
"Inputs": [],
|
||||
|
@ -66289,11 +66173,7 @@
|
|||
"Annotation": "WriteResponseFile Library/Bee/artifacts/rsp/13283745091630919918.rsp",
|
||||
"DisplayName": "Writing 13283745091630919918.rsp",
|
||||
"ActionType": "WriteFile",
|
||||
<<<<<<< HEAD
|
||||
"PayloadOffset": 3353315,
|
||||
=======
|
||||
"PayloadOffset": 3353282,
|
||||
>>>>>>> f7d047a43985d8f30df80a230201c233e8660fd1
|
||||
"PayloadLength": 28025,
|
||||
"PayloadDebugContentSnippet": "\"unity-ilpp-b7d9964f7067911f69",
|
||||
"Inputs": [],
|
||||
|
@ -67413,11 +67293,7 @@
|
|||
"Annotation": "WriteResponseFile Library/Bee/artifacts/rsp/1679197209529901891.rsp",
|
||||
"DisplayName": "Writing 1679197209529901891.rsp",
|
||||
"ActionType": "WriteFile",
|
||||
<<<<<<< HEAD
|
||||
"PayloadOffset": 3381429,
|
||||
=======
|
||||
"PayloadOffset": 3381396,
|
||||
>>>>>>> f7d047a43985d8f30df80a230201c233e8660fd1
|
||||
"PayloadLength": 26882,
|
||||
"PayloadDebugContentSnippet": "\"unity-ilpp-b7d9964f7067911f69",
|
||||
"Inputs": [],
|
||||
|
@ -68539,11 +68415,7 @@
|
|||
"Annotation": "WriteResponseFile Library/Bee/artifacts/rsp/6739825407743948386.rsp",
|
||||
"DisplayName": "Writing 6739825407743948386.rsp",
|
||||
"ActionType": "WriteFile",
|
||||
<<<<<<< HEAD
|
||||
"PayloadOffset": 3408400,
|
||||
=======
|
||||
"PayloadOffset": 3408367,
|
||||
>>>>>>> f7d047a43985d8f30df80a230201c233e8660fd1
|
||||
"PayloadLength": 28033,
|
||||
"PayloadDebugContentSnippet": "\"unity-ilpp-b7d9964f7067911f69",
|
||||
"Inputs": [],
|
||||
|
@ -69663,11 +69535,7 @@
|
|||
"Annotation": "WriteResponseFile Library/Bee/artifacts/rsp/5712859670010231491.rsp",
|
||||
"DisplayName": "Writing 5712859670010231491.rsp",
|
||||
"ActionType": "WriteFile",
|
||||
<<<<<<< HEAD
|
||||
"PayloadOffset": 3436522,
|
||||
=======
|
||||
"PayloadOffset": 3436489,
|
||||
>>>>>>> f7d047a43985d8f30df80a230201c233e8660fd1
|
||||
"PayloadLength": 28019,
|
||||
"PayloadDebugContentSnippet": "\"unity-ilpp-b7d9964f7067911f69",
|
||||
"Inputs": [],
|
||||
|
@ -70787,11 +70655,7 @@
|
|||
"Annotation": "WriteResponseFile Library/Bee/artifacts/rsp/8228270288922314647.rsp",
|
||||
"DisplayName": "Writing 8228270288922314647.rsp",
|
||||
"ActionType": "WriteFile",
|
||||
<<<<<<< HEAD
|
||||
"PayloadOffset": 3464630,
|
||||
=======
|
||||
"PayloadOffset": 3464597,
|
||||
>>>>>>> f7d047a43985d8f30df80a230201c233e8660fd1
|
||||
"PayloadLength": 27065,
|
||||
"PayloadDebugContentSnippet": "\"unity-ilpp-b7d9964f7067911f69",
|
||||
"Inputs": [],
|
||||
|
@ -71915,11 +71779,7 @@
|
|||
"Annotation": "WriteResponseFile Library/Bee/artifacts/rsp/1191125675877671024.rsp",
|
||||
"DisplayName": "Writing 1191125675877671024.rsp",
|
||||
"ActionType": "WriteFile",
|
||||
<<<<<<< HEAD
|
||||
"PayloadOffset": 3491784,
|
||||
=======
|
||||
"PayloadOffset": 3491751,
|
||||
>>>>>>> f7d047a43985d8f30df80a230201c233e8660fd1
|
||||
"PayloadLength": 28019,
|
||||
"PayloadDebugContentSnippet": "\"unity-ilpp-b7d9964f7067911f69",
|
||||
"Inputs": [],
|
||||
|
@ -73039,11 +72899,7 @@
|
|||
"Annotation": "WriteResponseFile Library/Bee/artifacts/rsp/15985480389207366606.rsp",
|
||||
"DisplayName": "Writing 15985480389207366606.rsp",
|
||||
"ActionType": "WriteFile",
|
||||
<<<<<<< HEAD
|
||||
"PayloadOffset": 3519893,
|
||||
=======
|
||||
"PayloadOffset": 3519860,
|
||||
>>>>>>> f7d047a43985d8f30df80a230201c233e8660fd1
|
||||
"PayloadLength": 28038,
|
||||
"PayloadDebugContentSnippet": "\"unity-ilpp-b7d9964f7067911f69",
|
||||
"Inputs": [],
|
||||
|
@ -74163,11 +74019,7 @@
|
|||
"Annotation": "WriteResponseFile Library/Bee/artifacts/rsp/17278736735188021267.rsp",
|
||||
"DisplayName": "Writing 17278736735188021267.rsp",
|
||||
"ActionType": "WriteFile",
|
||||
<<<<<<< HEAD
|
||||
"PayloadOffset": 3548021,
|
||||
=======
|
||||
"PayloadOffset": 3547988,
|
||||
>>>>>>> f7d047a43985d8f30df80a230201c233e8660fd1
|
||||
"PayloadLength": 28037,
|
||||
"PayloadDebugContentSnippet": "\"unity-ilpp-b7d9964f7067911f69",
|
||||
"Inputs": [],
|
||||
|
@ -75287,11 +75139,7 @@
|
|||
"Annotation": "WriteResponseFile Library/Bee/artifacts/rsp/17206416036114848451.rsp",
|
||||
"DisplayName": "Writing 17206416036114848451.rsp",
|
||||
"ActionType": "WriteFile",
|
||||
<<<<<<< HEAD
|
||||
"PayloadOffset": 3576148,
|
||||
=======
|
||||
"PayloadOffset": 3576115,
|
||||
>>>>>>> f7d047a43985d8f30df80a230201c233e8660fd1
|
||||
"PayloadLength": 26972,
|
||||
"PayloadDebugContentSnippet": "\"unity-ilpp-b7d9964f7067911f69",
|
||||
"Inputs": [],
|
||||
|
@ -76411,11 +76259,7 @@
|
|||
"Annotation": "WriteResponseFile Library/Bee/artifacts/rsp/5443183014039127430.rsp",
|
||||
"DisplayName": "Writing 5443183014039127430.rsp",
|
||||
"ActionType": "WriteFile",
|
||||
<<<<<<< HEAD
|
||||
"PayloadOffset": 3603209,
|
||||
=======
|
||||
"PayloadOffset": 3603176,
|
||||
>>>>>>> f7d047a43985d8f30df80a230201c233e8660fd1
|
||||
"PayloadLength": 27099,
|
||||
"PayloadDebugContentSnippet": "\"unity-ilpp-b7d9964f7067911f69",
|
||||
"Inputs": [],
|
||||
|
@ -77543,11 +77387,7 @@
|
|||
"Annotation": "WriteResponseFile Library/Bee/artifacts/rsp/17800325666717885748.rsp",
|
||||
"DisplayName": "Writing 17800325666717885748.rsp",
|
||||
"ActionType": "WriteFile",
|
||||
<<<<<<< HEAD
|
||||
"PayloadOffset": 3630398,
|
||||
=======
|
||||
"PayloadOffset": 3630365,
|
||||
>>>>>>> f7d047a43985d8f30df80a230201c233e8660fd1
|
||||
"PayloadLength": 28208,
|
||||
"PayloadDebugContentSnippet": "\"unity-ilpp-b7d9964f7067911f69",
|
||||
"Inputs": [],
|
||||
|
@ -78673,11 +78513,7 @@
|
|||
"Annotation": "WriteResponseFile Library/Bee/artifacts/rsp/15966794954598533518.rsp",
|
||||
"DisplayName": "Writing 15966794954598533518.rsp",
|
||||
"ActionType": "WriteFile",
|
||||
<<<<<<< HEAD
|
||||
"PayloadOffset": 3658696,
|
||||
=======
|
||||
"PayloadOffset": 3658663,
|
||||
>>>>>>> f7d047a43985d8f30df80a230201c233e8660fd1
|
||||
"PayloadLength": 26988,
|
||||
"PayloadDebugContentSnippet": "\"unity-ilpp-b7d9964f7067911f69",
|
||||
"Inputs": [],
|
||||
|
@ -79801,11 +79637,7 @@
|
|||
"Annotation": "WriteResponseFile Library/Bee/artifacts/rsp/4253268388439549233.rsp",
|
||||
"DisplayName": "Writing 4253268388439549233.rsp",
|
||||
"ActionType": "WriteFile",
|
||||
<<<<<<< HEAD
|
||||
"PayloadOffset": 3685773,
|
||||
=======
|
||||
"PayloadOffset": 3685740,
|
||||
>>>>>>> f7d047a43985d8f30df80a230201c233e8660fd1
|
||||
"PayloadLength": 28090,
|
||||
"PayloadDebugContentSnippet": "\"unity-ilpp-b7d9964f7067911f69",
|
||||
"Inputs": [],
|
||||
|
@ -80929,11 +80761,7 @@
|
|||
"Annotation": "WriteResponseFile Library/Bee/artifacts/rsp/1900804122408772859.rsp",
|
||||
"DisplayName": "Writing 1900804122408772859.rsp",
|
||||
"ActionType": "WriteFile",
|
||||
<<<<<<< HEAD
|
||||
"PayloadOffset": 3713952,
|
||||
=======
|
||||
"PayloadOffset": 3713919,
|
||||
>>>>>>> f7d047a43985d8f30df80a230201c233e8660fd1
|
||||
"PayloadLength": 28027,
|
||||
"PayloadDebugContentSnippet": "\"unity-ilpp-b7d9964f7067911f69",
|
||||
"Inputs": [],
|
||||
|
@ -82057,11 +81885,7 @@
|
|||
"Annotation": "WriteResponseFile Library/Bee/artifacts/rsp/10756517099639384098.rsp",
|
||||
"DisplayName": "Writing 10756517099639384098.rsp",
|
||||
"ActionType": "WriteFile",
|
||||
<<<<<<< HEAD
|
||||
"PayloadOffset": 3742069,
|
||||
=======
|
||||
"PayloadOffset": 3742036,
|
||||
>>>>>>> f7d047a43985d8f30df80a230201c233e8660fd1
|
||||
"PayloadLength": 28186,
|
||||
"PayloadDebugContentSnippet": "\"unity-ilpp-b7d9964f7067911f69",
|
||||
"Inputs": [],
|
||||
|
@ -83185,11 +83009,7 @@
|
|||
"Annotation": "WriteResponseFile Library/Bee/artifacts/rsp/12642482374746149726.rsp",
|
||||
"DisplayName": "Writing 12642482374746149726.rsp",
|
||||
"ActionType": "WriteFile",
|
||||
<<<<<<< HEAD
|
||||
"PayloadOffset": 3770345,
|
||||
=======
|
||||
"PayloadOffset": 3770312,
|
||||
>>>>>>> f7d047a43985d8f30df80a230201c233e8660fd1
|
||||
"PayloadLength": 26916,
|
||||
"PayloadDebugContentSnippet": "\"unity-ilpp-b7d9964f7067911f69",
|
||||
"Inputs": [],
|
||||
|
@ -84311,11 +84131,7 @@
|
|||
"Annotation": "WriteResponseFile Library/Bee/artifacts/rsp/12795318868982826981.rsp",
|
||||
"DisplayName": "Writing 12795318868982826981.rsp",
|
||||
"ActionType": "WriteFile",
|
||||
<<<<<<< HEAD
|
||||
"PayloadOffset": 3797351,
|
||||
=======
|
||||
"PayloadOffset": 3797318,
|
||||
>>>>>>> f7d047a43985d8f30df80a230201c233e8660fd1
|
||||
"PayloadLength": 28567,
|
||||
"PayloadDebugContentSnippet": "\"unity-ilpp-b7d9964f7067911f69",
|
||||
"Inputs": [],
|
||||
|
@ -85451,11 +85267,7 @@
|
|||
"Annotation": "WriteResponseFile Library/Bee/artifacts/rsp/7242863260540837981.rsp",
|
||||
"DisplayName": "Writing 7242863260540837981.rsp",
|
||||
"ActionType": "WriteFile",
|
||||
<<<<<<< HEAD
|
||||
"PayloadOffset": 3826007,
|
||||
=======
|
||||
"PayloadOffset": 3825974,
|
||||
>>>>>>> f7d047a43985d8f30df80a230201c233e8660fd1
|
||||
"PayloadLength": 28318,
|
||||
"PayloadDebugContentSnippet": "\"unity-ilpp-b7d9964f7067911f69",
|
||||
"Inputs": [],
|
||||
|
@ -86589,11 +86401,7 @@
|
|||
"Annotation": "WriteResponseFile Library/Bee/artifacts/rsp/18365255511867171480.rsp",
|
||||
"DisplayName": "Writing 18365255511867171480.rsp",
|
||||
"ActionType": "WriteFile",
|
||||
<<<<<<< HEAD
|
||||
"PayloadOffset": 3854415,
|
||||
=======
|
||||
"PayloadOffset": 3854382,
|
||||
>>>>>>> f7d047a43985d8f30df80a230201c233e8660fd1
|
||||
"PayloadLength": 28348,
|
||||
"PayloadDebugContentSnippet": "\"unity-ilpp-b7d9964f7067911f69",
|
||||
"Inputs": [],
|
||||
|
@ -87721,11 +87529,7 @@
|
|||
"Annotation": "WriteResponseFile Library/Bee/artifacts/rsp/7917304513136103991.rsp",
|
||||
"DisplayName": "Writing 7917304513136103991.rsp",
|
||||
"ActionType": "WriteFile",
|
||||
<<<<<<< HEAD
|
||||
"PayloadOffset": 3882852,
|
||||
=======
|
||||
"PayloadOffset": 3882819,
|
||||
>>>>>>> f7d047a43985d8f30df80a230201c233e8660fd1
|
||||
"PayloadLength": 28337,
|
||||
"PayloadDebugContentSnippet": "\"unity-ilpp-b7d9964f7067911f69",
|
||||
"Inputs": [],
|
||||
|
@ -88853,11 +88657,7 @@
|
|||
"Annotation": "WriteResponseFile Library/Bee/artifacts/rsp/8676632877312018987.rsp",
|
||||
"DisplayName": "Writing 8676632877312018987.rsp",
|
||||
"ActionType": "WriteFile",
|
||||
<<<<<<< HEAD
|
||||
"PayloadOffset": 3911278,
|
||||
=======
|
||||
"PayloadOffset": 3911245,
|
||||
>>>>>>> f7d047a43985d8f30df80a230201c233e8660fd1
|
||||
"PayloadLength": 28376,
|
||||
"PayloadDebugContentSnippet": "\"unity-ilpp-b7d9964f7067911f69",
|
||||
"Inputs": [],
|
||||
|
@ -89997,11 +89797,7 @@
|
|||
"Annotation": "WriteResponseFile Library/Bee/artifacts/rsp/10994719131465055300.rsp",
|
||||
"DisplayName": "Writing 10994719131465055300.rsp",
|
||||
"ActionType": "WriteFile",
|
||||
<<<<<<< HEAD
|
||||
"PayloadOffset": 3939744,
|
||||
=======
|
||||
"PayloadOffset": 3939711,
|
||||
>>>>>>> f7d047a43985d8f30df80a230201c233e8660fd1
|
||||
"PayloadLength": 28563,
|
||||
"PayloadDebugContentSnippet": "\"unity-ilpp-b7d9964f7067911f69",
|
||||
"Inputs": [],
|
||||
|
@ -91141,11 +90937,7 @@
|
|||
"Annotation": "WriteResponseFile Library/Bee/artifacts/rsp/11793066456053230617.rsp",
|
||||
"DisplayName": "Writing 11793066456053230617.rsp",
|
||||
"ActionType": "WriteFile",
|
||||
<<<<<<< HEAD
|
||||
"PayloadOffset": 3968397,
|
||||
=======
|
||||
"PayloadOffset": 3968364,
|
||||
>>>>>>> f7d047a43985d8f30df80a230201c233e8660fd1
|
||||
"PayloadLength": 28417,
|
||||
"PayloadDebugContentSnippet": "\"unity-ilpp-b7d9964f7067911f69",
|
||||
"Inputs": [],
|
||||
|
@ -92275,11 +92067,7 @@
|
|||
"Annotation": "WriteResponseFile Library/Bee/artifacts/rsp/3701870579560361197.rsp",
|
||||
"DisplayName": "Writing 3701870579560361197.rsp",
|
||||
"ActionType": "WriteFile",
|
||||
<<<<<<< HEAD
|
||||
"PayloadOffset": 3996903,
|
||||
=======
|
||||
"PayloadOffset": 3996870,
|
||||
>>>>>>> f7d047a43985d8f30df80a230201c233e8660fd1
|
||||
"PayloadLength": 28894,
|
||||
"PayloadDebugContentSnippet": "\"unity-ilpp-b7d9964f7067911f69",
|
||||
"Inputs": [],
|
||||
|
@ -93489,11 +93277,7 @@
|
|||
"Annotation": "WriteResponseFile Library/Bee/artifacts/rsp/7429754328999314785.rsp",
|
||||
"DisplayName": "Writing 7429754328999314785.rsp",
|
||||
"ActionType": "WriteFile",
|
||||
<<<<<<< HEAD
|
||||
"PayloadOffset": 4025886,
|
||||
=======
|
||||
"PayloadOffset": 4025853,
|
||||
>>>>>>> f7d047a43985d8f30df80a230201c233e8660fd1
|
||||
"PayloadLength": 31248,
|
||||
"PayloadDebugContentSnippet": "\"unity-ilpp-b7d9964f7067911f69",
|
||||
"Inputs": [],
|
||||
|
@ -94705,11 +94489,7 @@
|
|||
"Annotation": "WriteResponseFile Library/Bee/artifacts/rsp/13279423640760612673.rsp",
|
||||
"DisplayName": "Writing 13279423640760612673.rsp",
|
||||
"ActionType": "WriteFile",
|
||||
<<<<<<< HEAD
|
||||
"PayloadOffset": 4057224,
|
||||
=======
|
||||
"PayloadOffset": 4057191,
|
||||
>>>>>>> f7d047a43985d8f30df80a230201c233e8660fd1
|
||||
"PayloadLength": 28954,
|
||||
"PayloadDebugContentSnippet": "\"unity-ilpp-b7d9964f7067911f69",
|
||||
"Inputs": [],
|
||||
|
|
Binary file not shown.
Binary file not shown.
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
|
@ -1,10 +1,10 @@
|
|||
{ "pid": 35942, "tid": -1, "ph": "M", "name": "process_name", "args": { "name": "netcorerun.dll" } },
|
||||
{ "pid": 35942, "tid": -1, "ph": "M", "name": "process_sort_index", "args": { "sort_index": "-1" } },
|
||||
{ "pid": 35942, "tid": 1, "ph": "M", "name": "thread_name", "args": { "name": "" } },
|
||||
{ "pid": 35942, "tid": 1, "ts": 1701674602126011, "dur": 330482, "ph": "X", "name": "BuildProgram", "args": {} },
|
||||
{ "pid": 35942, "tid": 1, "ts": 1701674602126918, "dur": 50553, "ph": "X", "name": "BuildProgramContextConstructor", "args": {} },
|
||||
{ "pid": 35942, "tid": 1, "ts": 1701674602404786, "dur": 3597, "ph": "X", "name": "OutputData.Write", "args": {} },
|
||||
{ "pid": 35942, "tid": 1, "ts": 1701674602408387, "dur": 48090, "ph": "X", "name": "Backend.Write", "args": {} },
|
||||
{ "pid": 35942, "tid": 1, "ts": 1701674602409674, "dur": 32700, "ph": "X", "name": "JsonToString", "args": {} },
|
||||
{ "pid": 35942, "tid": 1, "ts": 1701674602462590, "dur": 1149, "ph": "X", "name": "", "args": {} },
|
||||
{ "pid": 35942, "tid": 1, "ts": 1701674602462071, "dur": 1899, "ph": "X", "name": "Write chrome-trace events", "args": {} },
|
||||
{ "pid": 35942, "tid": 1, "ts": 1701676582147358, "dur": 363559, "ph": "X", "name": "BuildProgram", "args": {} },
|
||||
{ "pid": 35942, "tid": 1, "ts": 1701676582148469, "dur": 59131, "ph": "X", "name": "BuildProgramContextConstructor", "args": {} },
|
||||
{ "pid": 35942, "tid": 1, "ts": 1701676582462415, "dur": 3783, "ph": "X", "name": "OutputData.Write", "args": {} },
|
||||
{ "pid": 35942, "tid": 1, "ts": 1701676582466201, "dur": 44697, "ph": "X", "name": "Backend.Write", "args": {} },
|
||||
{ "pid": 35942, "tid": 1, "ts": 1701676582467200, "dur": 33073, "ph": "X", "name": "JsonToString", "args": {} },
|
||||
{ "pid": 35942, "tid": 1, "ts": 1701676582517389, "dur": 1157, "ph": "X", "name": "", "args": {} },
|
||||
{ "pid": 35942, "tid": 1, "ts": 1701676582516873, "dur": 1897, "ph": "X", "name": "Write chrome-trace events", "args": {} },
|
||||
|
|
File diff suppressed because it is too large
Load Diff
Binary file not shown.
File diff suppressed because one or more lines are too long
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
|
@ -1 +1 @@
|
|||
{"m_DefineSymbols":{"m_Value":{"Android":"CT_RTV","EmbeddedLinux":"CT_RTV","GameCoreScarlett":"CT_RTV","GameCoreXboxOne":"CT_RTV","LinuxHeadlessSimulation":"CT_RTV","Nintendo Switch":"CT_RTV","PS4":"CT_RTV","PS5":"CT_RTV","QNX":"CT_RTV","Stadia":"CT_RTV","Standalone":"CT_RTV","WebGL":"CT_RTV","Windows Store Apps":"CT_RTV","XboxOne":"CT_RTV","iPhone":"CT_RTV","tvOS":"CT_RTV"},"m_Initialized":true},"m_AllowUnsafeCode":{"m_Value":false,"m_Initialized":false},"m_ScriptDebugInfoEnabled":{"m_Value":false,"m_Initialized":true}}
|
||||
{"m_DefineSymbols":{"m_Value":{"Android":"CT_RTV","EmbeddedLinux":"CT_RTV","GameCoreScarlett":"CT_RTV","GameCoreXboxOne":"CT_RTV","LinuxHeadlessSimulation":"CT_RTV","Nintendo Switch":"CT_RTV","PS4":"CT_RTV","PS5":"CT_RTV","QNX":"CT_RTV","Stadia":"CT_RTV","Standalone":"CT_RTV","WebGL":"CT_RTV","Windows Store Apps":"CT_RTV","XboxOne":"CT_RTV","iPhone":"CT_RTV","tvOS":"CT_RTV"},"m_Initialized":true},"m_AllowUnsafeCode":{"m_Value":false,"m_Initialized":false},"m_ScriptDebugInfoEnabled":{"m_Value":true,"m_Initialized":true}}
|
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue