From 65867dd23b35dc00ed0f3de3eb02dd8996f550d9 Mon Sep 17 00:00:00 2001 From: kangyanjun <2935661482@qq.com> Date: Mon, 17 Mar 2025 20:43:54 +0800 Subject: [PATCH] Update --- Assets/Scenes/SampleScene.unity | 106 +++++++++---- Assets/Scripts/GameManager.cs | 1 + Assets/Scripts/OnePageOne.cs | 3 +- .../script/DeepSeekReasonerStreamManager.cs | 13 +- Assets/script/DialogueCallerStream.cs | 2 +- Assets/script/InfoShow.cs | 4 +- Assets/script/LinkOpener.cs | 9 +- .../Layouts/CurrentMaximizeLayout.dwlt | 140 ++++++++--------- UserSettings/Layouts/default-2021.dwlt | 142 +++++++++--------- 9 files changed, 234 insertions(+), 186 deletions(-) diff --git a/Assets/Scenes/SampleScene.unity b/Assets/Scenes/SampleScene.unity index b2ae32f9..9e4ea492 100644 --- a/Assets/Scenes/SampleScene.unity +++ b/Assets/Scenes/SampleScene.unity @@ -1341,10 +1341,22 @@ PrefabInstance: propertyPath: m_Layer value: 6 objectReference: {fileID: 0} + - target: {fileID: -4683669308469848369, guid: bcb6e6bad012cef4b94eaa965a1c9422, type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: 0d91253c4fc38a14c81b482b0ee77e7e, type: 2} + - target: {fileID: -1461304994638716399, guid: bcb6e6bad012cef4b94eaa965a1c9422, type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: 0d91253c4fc38a14c81b482b0ee77e7e, type: 2} - target: {fileID: -1018664272722485354, guid: bcb6e6bad012cef4b94eaa965a1c9422, type: 3} propertyPath: m_Layer value: 6 objectReference: {fileID: 0} + - target: {fileID: -678588488315902003, guid: bcb6e6bad012cef4b94eaa965a1c9422, type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: 0d91253c4fc38a14c81b482b0ee77e7e, type: 2} - target: {fileID: -516098083770646512, guid: bcb6e6bad012cef4b94eaa965a1c9422, type: 3} propertyPath: m_Layer value: 6 @@ -1369,6 +1381,10 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 6317578925029434746, guid: bcb6e6bad012cef4b94eaa965a1c9422, type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: c84371c97be4a12499161cac78e40d32, type: 2} - target: {fileID: 8416272007918961125, guid: bcb6e6bad012cef4b94eaa965a1c9422, type: 3} propertyPath: m_Layer value: 6 @@ -1535,7 +1551,7 @@ RectTransform: - {fileID: 3047766562310706514} - {fileID: 1870057349} m_Father: {fileID: 2101799063} - m_RootOrder: 10 + m_RootOrder: 11 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 0} m_AnchorMax: {x: 1, y: 0} @@ -1707,8 +1723,8 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 1361586921} - {fileID: 1452013626} + - {fileID: 1361586921} m_Father: {fileID: 2101799063} m_RootOrder: 9 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -2059,8 +2075,8 @@ MonoBehaviour: m_TargetGraphic: {fileID: 864795410} m_HandleRect: {fileID: 864795409} m_Direction: 0 - m_Value: 0 - m_Size: 1 + m_Value: 1 + m_Size: 0.99999994 m_NumberOfSteps: 0 m_OnValueChanged: m_PersistentCalls: @@ -2225,7 +2241,7 @@ MonoBehaviour: m_VertexBufferAutoSizeReduction: 0 m_useMaxVisibleDescender: 1 m_pageToDisplay: 1 - m_margin: {x: 14.294922, y: 19.313232, z: 16.196777, w: 26.309753} + m_margin: {x: 106.54736, y: 49.619324, z: 96.547, w: -3.3755496} m_isUsingLegacyAnimationComponent: 0 m_isVolumetricText: 0 m_hasFontAssetChanged: 0 @@ -2710,7 +2726,7 @@ MonoBehaviour: m_TargetGraphic: {fileID: 1099520511} m_HandleRect: {fileID: 1099520510} m_Direction: 2 - m_Value: 1 + m_Value: 0 m_Size: 1 m_NumberOfSteps: 0 m_OnValueChanged: @@ -2885,7 +2901,7 @@ RectTransform: m_Children: - {fileID: 1699948069} m_Father: {fileID: 784939931} - m_RootOrder: 0 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1} @@ -2954,7 +2970,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: -0.00024414062, y: -0.00012207031} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1434205178 MonoBehaviour: @@ -3026,7 +3042,7 @@ RectTransform: m_ConstrainProportionsScale: 1 m_Children: [] m_Father: {fileID: 784939931} - m_RootOrder: 1 + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -3200,8 +3216,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} - m_AnchoredPosition: {x: -354, y: 216} - m_SizeDelta: {x: 2990.678, y: 1883.8649} + m_AnchoredPosition: {x: -513.099, y: 237.89} + m_SizeDelta: {x: 2777.8018, y: 1706.2} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1506294902 MonoBehaviour: @@ -3480,11 +3496,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1679051795240920595, guid: c033bda192f758840ae039e157a312bb, type: 3} propertyPath: m_SizeDelta.x - value: 165.33333 + value: 164.57426 objectReference: {fileID: 0} - target: {fileID: 1679051795240920595, guid: c033bda192f758840ae039e157a312bb, type: 3} propertyPath: m_SizeDelta.y - value: 41.333332 + value: 41.143566 objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c033bda192f758840ae039e157a312bb, type: 3} @@ -3931,9 +3947,9 @@ RectTransform: m_Father: {fileID: 761423867} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -4.4995117, y: 430.00006} + m_AnchorMin: {x: 1, y: 0} + m_AnchorMax: {x: 1, y: 0} + m_AnchoredPosition: {x: -466, y: 1396} m_SizeDelta: {x: 964, y: 1066} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1870057350 @@ -3989,7 +4005,7 @@ MonoBehaviour: m_Padding: m_Left: 37 m_Right: 20 - m_Top: 29 + m_Top: 11 m_Bottom: 198 m_ChildAlignment: 0 m_Spacing: 0 @@ -4133,7 +4149,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} m_AnchoredPosition: {x: -207, y: -50.5} - m_SizeDelta: {x: 270.96295, y: 99.888885} + m_SizeDelta: {x: 271.32513, y: 101.19093} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1973393624 CanvasRenderer: @@ -4592,7 +4608,7 @@ MonoBehaviour: m_ScaleFactor: 0.29 m_ReferenceResolution: {x: 3508, y: 2480} m_ScreenMatchMode: 0 - m_MatchWidthOrHeight: 1 + m_MatchWidthOrHeight: 0.86 m_PhysicalUnit: 3 m_FallbackScreenDPI: 96 m_DefaultSpriteDPI: 96 @@ -4642,8 +4658,8 @@ RectTransform: - {fileID: 1434205177} - {fileID: 1506294901} - {fileID: 784939931} - - {fileID: 761423867} - {fileID: 545472697} + - {fileID: 761423867} - {fileID: 1719739514} m_Father: {fileID: 0} m_RootOrder: 1 @@ -5549,7 +5565,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} m_AnchoredPosition: {x: 289, y: -801} - m_SizeDelta: {x: 71.18519, y: 52.814816} + m_SizeDelta: {x: 71.167244, y: 52.263447} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4342145817777117048 CanvasRenderer: @@ -5959,19 +5975,19 @@ PrefabInstance: m_Modifications: - target: {fileID: 7034249273538162967, guid: b617d7b1d1e151d4884fe9a8d34d9cd9, type: 3} propertyPath: m_SizeDelta.x - value: 2609.2305 + value: 2478.5562 objectReference: {fileID: 0} - target: {fileID: 7034249273538162967, guid: b617d7b1d1e151d4884fe9a8d34d9cd9, type: 3} propertyPath: m_SizeDelta.y - value: 1508.4265 + value: 1462.4557 objectReference: {fileID: 0} - target: {fileID: 7034249273538162967, guid: b617d7b1d1e151d4884fe9a8d34d9cd9, type: 3} propertyPath: m_AnchoredPosition.x - value: 7.1121 + value: 12.0654 objectReference: {fileID: 0} - target: {fileID: 7034249273538162967, guid: b617d7b1d1e151d4884fe9a8d34d9cd9, type: 3} propertyPath: m_AnchoredPosition.y - value: 7.3369 + value: 15.2503 objectReference: {fileID: 0} - target: {fileID: 8406049952940015151, guid: b617d7b1d1e151d4884fe9a8d34d9cd9, type: 3} propertyPath: m_IsActive @@ -5995,20 +6011,44 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8406049953763359941, guid: b617d7b1d1e151d4884fe9a8d34d9cd9, type: 3} propertyPath: m_SizeDelta.x - value: 2987.5298 + value: 2800 objectReference: {fileID: 0} - target: {fileID: 8406049953763359941, guid: b617d7b1d1e151d4884fe9a8d34d9cd9, type: 3} propertyPath: m_SizeDelta.y - value: 1831.1038 + value: 1750 objectReference: {fileID: 0} - target: {fileID: 8406049953763359941, guid: b617d7b1d1e151d4884fe9a8d34d9cd9, type: 3} propertyPath: m_AnchoredPosition.x - value: -382.4113 + value: -517 objectReference: {fileID: 0} - target: {fileID: 8406049953763359941, guid: b617d7b1d1e151d4884fe9a8d34d9cd9, type: 3} propertyPath: m_AnchoredPosition.y value: 235.6773 objectReference: {fileID: 0} + - target: {fileID: 8406049953869452797, guid: b617d7b1d1e151d4884fe9a8d34d9cd9, type: 3} + propertyPath: m_AnchorMax.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8406049953869452797, guid: b617d7b1d1e151d4884fe9a8d34d9cd9, type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8406049953869452797, guid: b617d7b1d1e151d4884fe9a8d34d9cd9, type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8406049953869452797, guid: b617d7b1d1e151d4884fe9a8d34d9cd9, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8406049953869452797, guid: b617d7b1d1e151d4884fe9a8d34d9cd9, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8406049953869452797, guid: b617d7b1d1e151d4884fe9a8d34d9cd9, type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} - target: {fileID: 8406049953869452798, guid: b617d7b1d1e151d4884fe9a8d34d9cd9, type: 3} propertyPath: m_Color.a value: 1 @@ -6063,11 +6103,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8406049954158853507, guid: b617d7b1d1e151d4884fe9a8d34d9cd9, type: 3} propertyPath: m_AnchoredPosition.x - value: -236 + value: -258 objectReference: {fileID: 0} - target: {fileID: 8406049954158853507, guid: b617d7b1d1e151d4884fe9a8d34d9cd9, type: 3} propertyPath: m_AnchoredPosition.y - value: -213 + value: -217 objectReference: {fileID: 0} - target: {fileID: 8406049954196613640, guid: b617d7b1d1e151d4884fe9a8d34d9cd9, type: 3} propertyPath: m_Pivot.x @@ -6079,7 +6119,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8406049954196613640, guid: b617d7b1d1e151d4884fe9a8d34d9cd9, type: 3} propertyPath: m_RootOrder - value: 11 + value: 10 objectReference: {fileID: 0} - target: {fileID: 8406049954196613640, guid: b617d7b1d1e151d4884fe9a8d34d9cd9, type: 3} propertyPath: m_AnchorMax.x @@ -6346,7 +6386,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} m_AnchoredPosition: {x: 289, y: -559} - m_SizeDelta: {x: 71.18519, y: 52.814816} + m_SizeDelta: {x: 71.167244, y: 52.263447} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &8456368757241615099 MonoBehaviour: @@ -6678,5 +6718,5 @@ RectTransform: m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} m_AnchoredPosition: {x: 378, y: -438} - m_SizeDelta: {x: 270.96295, y: 99.888885} + m_SizeDelta: {x: 271.32513, y: 101.19093} m_Pivot: {x: 0.5, y: 0.5} diff --git a/Assets/Scripts/GameManager.cs b/Assets/Scripts/GameManager.cs index 98ae6308..220d64a8 100644 --- a/Assets/Scripts/GameManager.cs +++ b/Assets/Scripts/GameManager.cs @@ -22,6 +22,7 @@ public class GameManager : MonoBehaviour public InfoShow infoShow; public GameObject Shop; public GameObject ImgMask; + public bool stopAnimation = false; void Start() { diff --git a/Assets/Scripts/OnePageOne.cs b/Assets/Scripts/OnePageOne.cs index 6f6cdd2b..bcced1d2 100644 --- a/Assets/Scripts/OnePageOne.cs +++ b/Assets/Scripts/OnePageOne.cs @@ -25,7 +25,8 @@ public class OnePageOne : MonoBehaviour private void OnBtnStartClick() { - GameManager.Instance.StopVideoPlayer(); + GameManager.Instance.stopAnimation = true; + GameManager.Instance.StopVideoPlayer(); GameManager.Instance.infoTGo.text = GameManager.Instance.infoShow.ParseClickableText("小船可手动翻转宣看结构哦\n\n\n[我想进入上一阶段的学习]\r\n[我结束今天的学习]"); GameManager.Instance.Shop.gameObject.SetActive(true); GameManager.Instance.ImgMask.SetActive(true); diff --git a/Assets/script/DeepSeekReasonerStreamManager.cs b/Assets/script/DeepSeekReasonerStreamManager.cs index 2198a0bf..af6bb8e2 100644 --- a/Assets/script/DeepSeekReasonerStreamManager.cs +++ b/Assets/script/DeepSeekReasonerStreamManager.cs @@ -142,8 +142,10 @@ public class DeepSeekReasonerStreamManager : MonoBehaviour private IEnumerator AnimateReasoningText() { string displayed = ""; + GameManager.Instance.stopAnimation = false; // 鍏佽鎵ц while (!streamingCompleted || displayed.Length < reasoningBuffer.Length) { + if (GameManager.Instance.stopAnimation) break; // 绔嬪嵆鍋滄 if (displayed.Length < reasoningBuffer.Length) { displayed = reasoningBuffer.ToString().Substring(0, displayed.Length + 1); @@ -155,8 +157,13 @@ public class DeepSeekReasonerStreamManager : MonoBehaviour yield return new WaitForSeconds(0.5f); + if (!GameManager.Instance.stopAnimation) + { + yield return new WaitForSeconds(0.5f); + linkidResponse(contentBuffer.ToString()); + } //dialogueText.text = contentBuffer.ToString(); - linkidResponse(contentBuffer.ToString()); + // linkidResponse(contentBuffer.ToString()); } private void linkidResponse(string response) @@ -171,8 +178,8 @@ public class DeepSeekReasonerStreamManager : MonoBehaviour infoShow.ShowInfo( new Dictionary { - {"浠涔堟槸娼滆墖?","涓绉嶆綔姘寸敤鍏"}, - {"浠涔堟槸鑸瘝?","涓绉嶈埞"} + {"浠涔堟槸娼滆墖?","娼滆墖鏄竴绉嶈兘澶熷湪姘翠笅鑸鐨勭壒绉嶈埌鑹囷紝涓昏鐢ㄤ簬鍐涗簨渚﹀療銆佹垬鏂楀贰閫汇佺瀵嗚繍杈撶瓑浠诲姟銆傛綔鑹囧埄鐢ㄥ唴閮ㄧ殑鍘嬭浇鑸辫皟鏁磋嚜韬诞鍔涳紝瀹炵幇娴嚭姘撮潰鎴栦笅娼滄按涓殑鑳藉姏銆傜幇浠ｆ綔鑹囬氬父閰嶅鏌存补鍙戝姩鏈烘垨鏍稿姩鍔涚郴缁燂紝鑳藉闀挎椂闂存綔浼忓湪姘翠笅鎵ц浠诲姟銆傚啗浜嬫綔鑹囬氬父鎼哄甫楸奸浄銆佸寮规垨姘撮浄绛夋鍣紝鑳藉瀵规晫鏂硅埌鑸瑰疄鏂芥墦鍑汇傛澶栵紝娼滆墖杩樺彲鐢ㄤ簬娴锋磱绉戝鐮旂┒銆佹繁娴锋帰娴嬪拰鎼滄晳浠诲姟銆傚湪鍘嗗彶涓婏紝娼滆墖鍦ㄧ涓娆″拰绗簩娆′笘鐣屽ぇ鎴樹腑閮藉彂鎸ヤ簡閲嶈浣滅敤锛屽挨鍏舵槸寰峰浗鐨勨淯鍨嬫綔鑹団濆娴锋垬浜х敓浜嗘繁杩滃奖鍝嶃傚浠婏紝鍚勫浗娴峰啗鏅亶瑁呭涓嶅悓绫诲瀷鐨勬綔鑹囷紝濡傛垬鐣ユ牳娼滆墖銆佹敾鍑诲瀷娼滆墖鍜屽父瑙勫姩鍔涙綔鑹囷紝浠ユ墽琛屽悇绉嶅啗浜嬪拰闈炲啗浜嬩换鍔°"}, + {"浠涔堟槸鑸瘝?","鑸┖姣嶈埌锛岀畝绉拌埅姣嶏紝鏄竴绉嶄笓闂ㄧ敤浜庢惌杞藉拰璧烽檷鎴樻枟鏈虹殑澶у瀷姘撮潰鑸拌墖銆傝埅姣嶉氬父閰嶅宸ㄥぇ鐨勭敳鏉夸綔涓洪鏈虹殑璺戦亾锛屽苟璁炬湁鍗囬檷鏈恒佹満搴撶瓑杈呭姪璁炬柦锛屼娇鑸拌浇鏈鸿兘澶熼珮鏁堣捣闄嶅拰缁存姢銆傜幇浠ｈ埅姣嶄竴鑸敱鏍稿姩鍔涙垨甯歌鍔ㄥ姏鎻愪緵鍔ㄥ姏锛屾嫢鏈夊己澶х殑缁埅鑳藉姏銆傝埅姣嶄笉浠呮槸涓绉嶆捣涓婂啗浜嬪熀鍦帮紝杩樻槸鍥藉娴峰啗鍔涢噺鐨勮薄寰侊紝鑳藉鍦ㄨ繙绂绘湰鍦熺殑娴峰煙瀹炴柦绌轰腑浣滄垬浠诲姟銆傚叾鑸拌浇鏈虹紪闃熻兘澶熸墽琛屽埗绌恒佸娴锋墦鍑汇佸弽娼滀綔鎴樸佺數瀛愭垬绛夊绉嶄换鍔°傝埅姣嶆垬鏂楃兢閫氬父鐢遍┍閫愯埌銆佹姢鍗埌銆佽ˉ缁欒埌鍜屾綔鑹囩瓑鎶よ埅鑸拌墖缁勬垚锛屽舰鎴愬己澶х殑浣滄垬浣撶郴銆備笘鐣屼富瑕佹捣鍐涘己鍥斤紝濡傜編鍥姐佷腑鍥姐佽嫳鍥姐佹硶鍥界瓑锛岄兘瑁呭鏈変笉鍚岀骇鍒殑鑸瘝锛屽苟鎸佺画鍙戝睍鏂板瀷鑸拌浇鏈哄拰鑸瘝鎴樻枟浣撶郴銆"} } ); } diff --git a/Assets/script/DialogueCallerStream.cs b/Assets/script/DialogueCallerStream.cs index dd1e5ce2..7eacd269 100644 --- a/Assets/script/DialogueCallerStream.cs +++ b/Assets/script/DialogueCallerStream.cs @@ -9,7 +9,7 @@ public class DialogueCallerStream : MonoBehaviour public InputField inputField; // 瀹氫箟绯荤粺鎻愮ず锛堝彲鏍规嵁闇瑕佷慨鏀规垨绉婚櫎锛 - private const string systemPrompt = "浣犳槸涓涓皬瀛︾瀛﹁佸笀,浣犻渶瑕佺粰鎴戞妸鎴戠殑绛旀鐢ㄥ皬瀛︾敓鑳藉惉鎳傜殑璇█璁茶В,闄愬埗涓300瀛楀唴"; + private const string systemPrompt = "鎴戞槸涓涓皬瀛︾敓,姝ｅ湪鑷绉戝璇剧▼锛岄渶瑕佹妸绛旀鐢ㄥ皬瀛︾敓鑳藉惉鎳傜殑璇█璁茶В,闄愬埗涓300瀛楀唴"; // 姣忔鍙戦佺敤鎴锋秷鎭兘浼氫綔涓轰竴涓叏鏂扮殑闂澶勭悊 public void SendUserMessage(string msg) diff --git a/Assets/script/InfoShow.cs b/Assets/script/InfoShow.cs index a67c9e6d..10ec020d 100644 --- a/Assets/script/InfoShow.cs +++ b/Assets/script/InfoShow.cs @@ -45,8 +45,8 @@ public class InfoShow : MonoBehaviour, IPointerClickHandler displayText += ParseClickableText("[鎴戠粨鏉熶粖澶╃殑瀛︿範]\n"); textMeshProUGUI.text = displayText; - RectTransform rectTransform = textMeshProUGUI.transform.parent.GetComponent(); - rectTransform.anchoredPosition += new Vector2(0, 50);// 鏀瑰彉 UI 浣嶇疆 + // RectTransform rectTransform = textMeshProUGUI.transform.parent.GetComponent(); + // rectTransform.anchoredPosition += new Vector2(0, 50);// 鏀瑰彉 UI 浣嶇疆 } // 澶勭悊鐐瑰嚮浜嬩欢 diff --git a/Assets/script/LinkOpener.cs b/Assets/script/LinkOpener.cs index 262767d8..b1a9eb1e 100644 --- a/Assets/script/LinkOpener.cs +++ b/Assets/script/LinkOpener.cs @@ -50,11 +50,10 @@ public class LinkOpener : MonoBehaviour, IPointerClickHandler private void HandleLinkClick(string linkID) { string myString = "璇蜂綘鎻愬嚭涓浜涙湁鍏" + linkID + "鐨勯棶棰" + - "锛岃姹傛槸2-3涓紝鏈濂芥槸绉戞櫘鎬х殑锛屼緥濡: 浠涔堟槸鑸瘝锛" + - "鍥炵瓟鐨勬椂鍊欐渶濂芥槸浠SON鐨勬牸寮忓洖绛旓紝姣斿锛歿\"鑸瘝\": \"鑸┖姣嶈埌鏄竴绉嶅ぇ鍨嬫按闈㈣埌鑸癸紝浠ヨ埌杞介鏈轰负涓昏姝﹀櫒\", " + - "\"娼滆墖\": \"涓绉嶆按涓嬩綔鎴樻鍣╘"}" + - "銆傝涓瀹氳寰楀洖绛旂殑鍐呭瑕佺敤{}鎷捣鏉ワ紝鍗冧竾鍒繕浜嗙粰鏁翠釜鍐呭鍔犱笂{},绛旀璇︾粏涓鐐癸紝250瀛楀乏鍙冲惂"; - + "锛岃姹傛槸2-3涓紝鏈濂芥槸绉戞櫘鎬х殑锛屽皬瀛︾敓鎰熷叴瓒ｇ殑锛屼緥濡: 浠涔堟槸鑸瘝锛" + + "鍥炵瓟鐨勬椂鍊欐渶濂芥槸浠SON鐨勬牸寮忓洖绛旓紝姣斿锛歿\"浠涔堟槸鑸瘝锛焅": \"鑸┖姣嶈埌鏄竴绉嶅ぇ鍨嬫按闈㈣埌鑸癸紝浠ヨ埌杞介鏈轰负涓昏姝﹀櫒\", " + + "\"浠涔堟槸娼滆墖锛焅": \"涓绉嶆按涓嬩綔鎴樻鍣╘"}" + + "銆傝涓瀹氳寰楀洖绛旂殑鍐呭瑕佺敤{}鎷捣鏉ワ紝鍗冧竾鍒繕浜嗙粰鏁翠釜鍐呭鍔犱笂{},姣忎釜绛旀鐨勫唴瀹瑰湪250瀛楀乏鍙"; deepSeekReasonerStreamManager.infoShow = infoShow; deepSeekReasonerStreamManager.dialogueText = infoShow.textMeshProUGUI; diff --git a/UserSettings/Layouts/CurrentMaximizeLayout.dwlt b/UserSettings/Layouts/CurrentMaximizeLayout.dwlt index 15cd4ed3..276f2ed6 100644 --- a/UserSettings/Layouts/CurrentMaximizeLayout.dwlt +++ b/UserSettings/Layouts/CurrentMaximizeLayout.dwlt @@ -48,9 +48,9 @@ MonoBehaviour: m_Pos: serializedVersion: 2 x: 0 - y: 191.2 - width: 575.8 - height: 584.2 + y: 341.6 + width: 724.6 + height: 433.8 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -89,7 +89,7 @@ MonoBehaviour: m_HSlider: 0 m_VSlider: 0 m_IgnoreScrollWheelUntilClicked: 0 - m_EnableMouseInput: 1 + m_EnableMouseInput: 0 m_EnableSliderZoomHorizontal: 0 m_EnableSliderZoomVertical: 0 m_UniformScale: 1 @@ -98,10 +98,10 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 21 - width: 575.8 - height: 563.2 - m_Scale: {x: 0.1874349, y: 0.1874349} - m_Translation: {x: 287.9, y: 281.6} + width: 724.6 + height: 412.8 + m_Scale: {x: 0.23587239, y: 0.23587237} + m_Translation: {x: 362.3, y: 206.4} m_MarginLeft: 0 m_MarginRight: 0 m_MarginTop: 0 @@ -109,15 +109,15 @@ MonoBehaviour: m_LastShownAreaInsideMargins: serializedVersion: 2 x: -1536 - y: -1502.3883 + y: -875.04944 width: 3072 - height: 3004.7766 + height: 1750.0989 m_MinimalGUI: 1 - m_defaultScale: 0.1874349 - m_LastWindowPixelSize: {x: 719.75, y: 730.25} + m_defaultScale: 0.23587239 + m_LastWindowPixelSize: {x: 905.75, y: 542.25} m_ClearInEditMode: 1 m_NoCameraWarning: 1 - m_LowResolutionForAspectRatios: 01000000000000000000 + m_LowResolutionForAspectRatios: 00000000000000000000 m_XRRenderMode: 0 m_RenderTexture: {fileID: 0} --- !u!114 &3 @@ -139,7 +139,7 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 576.8 + width: 725.6 height: 722.8 m_MinSize: {x: 100, y: 200} m_MaxSize: {x: 8096, y: 16192} @@ -162,10 +162,10 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 576.8 - height: 117.6 - m_MinSize: {x: 201, y: 221} - m_MaxSize: {x: 4001, y: 4021} + width: 725.6 + height: 268 + m_MinSize: {x: 200, y: 200} + m_MaxSize: {x: 4000, y: 4000} m_ActualView: {fileID: 5} m_Panes: - {fileID: 5} @@ -193,8 +193,8 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 73.6 - width: 575.8 - height: 96.6 + width: 724.6 + height: 247 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -204,8 +204,8 @@ MonoBehaviour: floating: 0 collapsed: 0 displayed: 1 - snapOffset: {x: -101, y: -26} - snapOffsetDelta: {x: 0, y: 0} + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: -100, y: -25.59999} snapCorner: 3 id: Tool Settings index: 0 @@ -215,9 +215,9 @@ MonoBehaviour: floating: 0 collapsed: 0 displayed: 1 - snapOffset: {x: -141, y: -92} + snapOffset: {x: -141, y: 149} snapOffsetDelta: {x: 0, y: 0} - snapCorner: 3 + snapCorner: 1 id: unity-grid-and-snap-toolbar index: 1 layout: 1 @@ -226,7 +226,7 @@ MonoBehaviour: floating: 0 collapsed: 0 displayed: 1 - snapOffset: {x: 0, y: 24.8} + snapOffset: {x: 0, y: 0} snapOffsetDelta: {x: 0, y: 0} snapCorner: 0 id: unity-scene-view-toolbar @@ -270,7 +270,7 @@ MonoBehaviour: floating: 0 collapsed: 0 displayed: 1 - snapOffset: {x: 67.5, y: 36.399994} + snapOffset: {x: 67.5, y: 86} snapOffsetDelta: {x: 0, y: 0} snapCorner: 0 id: Orientation @@ -442,7 +442,7 @@ MonoBehaviour: index: 3 layout: 4 m_OverlaysVisible: 1 - m_WindowGUID: 2c8cda2afdb778e42bf9055bb1181cee + m_WindowGUID: f20495f6b9beda44495429613d263b24 m_Gizmos: 1 m_OverrideSceneCullingMask: 6917529027641081856 m_SceneIsLit: 1 @@ -452,9 +452,9 @@ MonoBehaviour: m_PlayAudio: 0 m_AudioPlay: 0 m_Position: - m_Target: {x: 2660.1853, y: 700.9155, z: -10.821165} + m_Target: {x: 997.1068, y: 1093.5237, z: 6.847948} speed: 2 - m_Value: {x: 2660.1853, y: 700.9155, z: -10.821165} + m_Value: {x: 997.1068, y: 1093.5237, z: 6.847948} m_RenderMode: 0 m_CameraMode: drawMode: 0 @@ -480,7 +480,7 @@ MonoBehaviour: m_Value: 0 m_Color: {r: 0.5, g: 0.5, b: 0.5, a: 0.4} m_Pivot: {x: 0, y: 0, z: 0} - m_Size: {x: 1, y: 1} + m_Size: {x: 0, y: 0} yGrid: m_Fade: m_Target: 0 @@ -488,7 +488,7 @@ MonoBehaviour: m_Value: 0 m_Color: {r: 0.5, g: 0.5, b: 0.5, a: 0.4} m_Pivot: {x: 0, y: 0, z: 0} - m_Size: {x: 1, y: 1} + m_Size: {x: 0, y: 0} zGrid: m_Fade: m_Target: 1 @@ -505,9 +505,9 @@ MonoBehaviour: speed: 2 m_Value: {x: 0, y: 0, z: 0, w: 1} m_Size: - m_Target: 1193.2651 + m_Target: 1518.0576 speed: 2 - m_Value: 1193.2651 + m_Value: 1518.0576 m_Ortho: m_Target: 1 speed: 2 @@ -548,9 +548,9 @@ MonoBehaviour: m_Position: serializedVersion: 2 x: 0 - y: 117.6 - width: 576.8 - height: 605.2 + y: 268 + width: 725.6 + height: 454.8 m_MinSize: {x: 201, y: 221} m_MaxSize: {x: 4001, y: 4021} m_ActualView: {fileID: 2} @@ -573,9 +573,9 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 576.8 + x: 725.6 y: 0 - width: 272.8 + width: 247.20001 height: 722.8 m_MinSize: {x: 202, y: 221} m_MaxSize: {x: 4002, y: 4021} @@ -604,9 +604,9 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 576.8 + x: 725.60004 y: 73.6 - width: 270.8 + width: 245.20001 height: 701.8 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: @@ -616,9 +616,9 @@ MonoBehaviour: m_SceneHierarchy: m_TreeViewState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: - m_LastClickedID: 0 - m_ExpandedIDs: c6a5ffff10a6ffff3ea8ffff86daffff42ecffff52ecffff5eecffff26fbffff125f0000485f0000545f00007e5f00008a5f0000ae5f0000b85f0000c65f0000 + m_SelectedIDs: d62b0100 + m_LastClickedID: 76758 + m_ExpandedIDs: 3484ffff7e84ffffac86ffff26fbffffa413010090140100da140100862b0100 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -634,14 +634,14 @@ MonoBehaviour: m_IsRenaming: 0 m_OriginalEventType: 11 m_IsRenamingFilename: 0 - m_ClientGUIView: {fileID: 7} + m_ClientGUIView: {fileID: 0} m_SearchString: m_ExpandedScenes: [] m_CurrenRootInstanceID: 0 m_LockTracker: m_IsLocked: 0 m_CurrentSortingName: TransformSorting - m_WindowGUID: 69aec9439f374234ebb7360b660b5efe + m_WindowGUID: 99901e27cd5d19b4693378468aaac437 --- !u!114 &9 MonoBehaviour: m_ObjectHideFlags: 52 @@ -652,14 +652,14 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 1 m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} - m_Name: ProjectBrowser + m_Name: m_EditorClassIdentifier: m_Children: [] m_Position: serializedVersion: 2 - x: 849.6 + x: 972.8 y: 0 - width: 391.20007 + width: 220.00006 height: 722.8 m_MinSize: {x: 232, y: 271} m_MaxSize: {x: 10002, y: 10021} @@ -688,9 +688,9 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 849.60004 + x: 972.8 y: 73.6 - width: 389.20007 + width: 218.00006 height: 701.8 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: @@ -708,23 +708,23 @@ MonoBehaviour: m_SkipHidden: 0 m_SearchArea: 1 m_Folders: - - Assets/Scripts + - Assets m_Globs: [] m_OriginalText: m_FilterByTypeIntersection: 0 m_ViewMode: 1 - m_StartGridSize: 16 + m_StartGridSize: 64 m_LastFolders: - - Assets/Scripts - m_LastFoldersGridSize: 16 + - Assets + m_LastFoldersGridSize: -1 m_LastProjectPath: C:\Users\A1891\Desktop\MyBookPage m_LockTracker: m_IsLocked: 0 m_FolderTreeState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: 2a620000 - m_LastClickedID: 25130 - m_ExpandedIDs: 0000000014620000ffffff7f + m_SelectedIDs: 70620000 + m_LastClickedID: 25200 + m_ExpandedIDs: 000000007062000086620000ffffff7f m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -740,7 +740,7 @@ MonoBehaviour: m_IsRenaming: 0 m_OriginalEventType: 11 m_IsRenamingFilename: 1 - m_ClientGUIView: {fileID: 9} + m_ClientGUIView: {fileID: 0} m_SearchString: m_CreateAssetUtility: m_EndAction: {fileID: 0} @@ -752,7 +752,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 0000000014620000ffffff7f + m_ExpandedIDs: 000000007062000086620000ffffff7f m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -777,10 +777,10 @@ MonoBehaviour: m_Icon: {fileID: 0} m_ResourceFile: m_ListAreaState: - m_SelectedInstanceIDs: - m_LastClickedInstanceID: 0 + m_SelectedInstanceIDs: d62b0100 + m_LastClickedInstanceID: 76758 m_HadKeyboardFocusLastEvent: 0 - m_ExpandedInstanceIDs: 00000000228b0000d8890000 + m_ExpandedInstanceIDs: m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -796,7 +796,7 @@ MonoBehaviour: m_IsRenaming: 0 m_OriginalEventType: 11 m_IsRenamingFilename: 1 - m_ClientGUIView: {fileID: 9} + m_ClientGUIView: {fileID: 0} m_CreateAssetUtility: m_EndAction: {fileID: 0} m_InstanceID: 0 @@ -805,9 +805,9 @@ MonoBehaviour: m_ResourceFile: m_NewAssetIndexInList: -1 m_ScrollPosition: {x: 0, y: 0} - m_GridSize: 16 + m_GridSize: 64 m_SkipHiddenPackages: 0 - m_DirectoriesAreaWidth: 231.19998 + m_DirectoriesAreaWidth: 115 --- !u!114 &11 MonoBehaviour: m_ObjectHideFlags: 52 @@ -818,14 +818,14 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 1 m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} - m_Name: InspectorWindow + m_Name: m_EditorClassIdentifier: m_Children: [] m_Position: serializedVersion: 2 - x: 1240.8 + x: 1192.8 y: 0 - width: 295.19995 + width: 343.19995 height: 722.8 m_MinSize: {x: 276, y: 71} m_MaxSize: {x: 4001, y: 4021} @@ -854,9 +854,9 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 1240.8 + x: 1192.8 y: 73.6 - width: 294.19995 + width: 342.19995 height: 701.8 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: diff --git a/UserSettings/Layouts/default-2021.dwlt b/UserSettings/Layouts/default-2021.dwlt index 9ba1b9cd..0db89f05 100644 --- a/UserSettings/Layouts/default-2021.dwlt +++ b/UserSettings/Layouts/default-2021.dwlt @@ -19,9 +19,9 @@ MonoBehaviour: width: 1536 height: 772.8 m_ShowMode: 4 - m_Title: Game + m_Title: Inspector m_RootView: {fileID: 2} - m_MinSize: {x: 875, y: 492} + m_MinSize: {x: 875, y: 300} m_MaxSize: {x: 10000, y: 10000} m_Maximized: 1 --- !u!114 &2 @@ -73,7 +73,7 @@ MonoBehaviour: height: 30 m_MinSize: {x: 0, y: 0} m_MaxSize: {x: 0, y: 0} - m_LastLoadedLayoutName: + m_LastLoadedLayoutName: 2 by 3 --- !u!114 &4 MonoBehaviour: m_ObjectHideFlags: 52 @@ -121,7 +121,7 @@ MonoBehaviour: m_MinSize: {x: 400, y: 200} m_MaxSize: {x: 32384, y: 16192} vertical: 0 - controlID: 18640 + controlID: 23954 --- !u!114 &6 MonoBehaviour: m_ObjectHideFlags: 52 @@ -141,12 +141,12 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 576.8 + width: 725.6 height: 722.8 m_MinSize: {x: 100, y: 200} m_MaxSize: {x: 8096, y: 16192} vertical: 1 - controlID: 18734 + controlID: 23955 --- !u!114 &7 MonoBehaviour: m_ObjectHideFlags: 52 @@ -164,10 +164,10 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 576.8 - height: 325.6 - m_MinSize: {x: 201, y: 221} - m_MaxSize: {x: 4001, y: 4021} + width: 725.6 + height: 268 + m_MinSize: {x: 200, y: 200} + m_MaxSize: {x: 4000, y: 4000} m_ActualView: {fileID: 13} m_Panes: - {fileID: 13} @@ -189,9 +189,9 @@ MonoBehaviour: m_Position: serializedVersion: 2 x: 0 - y: 325.6 - width: 576.8 - height: 397.19998 + y: 268 + width: 725.6 + height: 454.8 m_MinSize: {x: 201, y: 221} m_MaxSize: {x: 4001, y: 4021} m_ActualView: {fileID: 12} @@ -214,9 +214,9 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 576.8 + x: 725.6 y: 0 - width: 272.8 + width: 247.20001 height: 722.8 m_MinSize: {x: 202, y: 221} m_MaxSize: {x: 4002, y: 4021} @@ -235,14 +235,14 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 1 m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} - m_Name: ProjectBrowser + m_Name: m_EditorClassIdentifier: m_Children: [] m_Position: serializedVersion: 2 - x: 849.6 + x: 972.8 y: 0 - width: 391.20007 + width: 220.00006 height: 722.8 m_MinSize: {x: 232, y: 271} m_MaxSize: {x: 10002, y: 10021} @@ -261,17 +261,17 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 1 m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} - m_Name: InspectorWindow + m_Name: m_EditorClassIdentifier: m_Children: [] m_Position: serializedVersion: 2 - x: 1240.8 + x: 1192.8 y: 0 - width: 295.19995 + width: 343.19995 height: 722.8 - m_MinSize: {x: 276, y: 71} - m_MaxSize: {x: 4001, y: 4021} + m_MinSize: {x: 275, y: 50} + m_MaxSize: {x: 4000, y: 4000} m_ActualView: {fileID: 16} m_Panes: - {fileID: 16} @@ -298,9 +298,9 @@ MonoBehaviour: m_Pos: serializedVersion: 2 x: 0 - y: 399.2 - width: 575.8 - height: 376.19998 + y: 341.6 + width: 724.6 + height: 433.8 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -348,10 +348,10 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 21 - width: 575.8 - height: 355.19998 - m_Scale: {x: 0.1874349, y: 0.1874349} - m_Translation: {x: 287.9, y: 177.59999} + width: 724.6 + height: 412.8 + m_Scale: {x: 0.23587239, y: 0.23587237} + m_Translation: {x: 362.3, y: 206.4} m_MarginLeft: 0 m_MarginRight: 0 m_MarginTop: 0 @@ -359,15 +359,15 @@ MonoBehaviour: m_LastShownAreaInsideMargins: serializedVersion: 2 x: -1536 - y: -947.52893 + y: -875.04944 width: 3072 - height: 1895.0579 + height: 1750.0989 m_MinimalGUI: 1 - m_defaultScale: 0.1874349 - m_LastWindowPixelSize: {x: 719.75, y: 470.24997} + m_defaultScale: 0.23587239 + m_LastWindowPixelSize: {x: 905.75, y: 542.25} m_ClearInEditMode: 1 m_NoCameraWarning: 1 - m_LowResolutionForAspectRatios: 01000000000000000000 + m_LowResolutionForAspectRatios: 00000000000000000000 m_XRRenderMode: 0 m_RenderTexture: {fileID: 0} --- !u!114 &13 @@ -392,8 +392,8 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 73.6 - width: 575.8 - height: 304.6 + width: 724.6 + height: 247 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -403,8 +403,8 @@ MonoBehaviour: floating: 0 collapsed: 0 displayed: 1 - snapOffset: {x: -101, y: -26} - snapOffsetDelta: {x: 0, y: 0} + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: -100, y: -25.59999} snapCorner: 3 id: Tool Settings index: 0 @@ -414,9 +414,9 @@ MonoBehaviour: floating: 0 collapsed: 0 displayed: 1 - snapOffset: {x: -141, y: -92} + snapOffset: {x: -141, y: 149} snapOffsetDelta: {x: 0, y: 0} - snapCorner: 3 + snapCorner: 1 id: unity-grid-and-snap-toolbar index: 1 layout: 1 @@ -425,7 +425,7 @@ MonoBehaviour: floating: 0 collapsed: 0 displayed: 1 - snapOffset: {x: 0, y: 24.8} + snapOffset: {x: 0, y: 0} snapOffsetDelta: {x: 0, y: 0} snapCorner: 0 id: unity-scene-view-toolbar @@ -469,7 +469,7 @@ MonoBehaviour: floating: 0 collapsed: 0 displayed: 1 - snapOffset: {x: 67.5, y: 36.399994} + snapOffset: {x: 67.5, y: 86} snapOffsetDelta: {x: 0, y: 0} snapCorner: 0 id: Orientation @@ -641,7 +641,7 @@ MonoBehaviour: index: 3 layout: 4 m_OverlaysVisible: 1 - m_WindowGUID: 2c8cda2afdb778e42bf9055bb1181cee + m_WindowGUID: f20495f6b9beda44495429613d263b24 m_Gizmos: 1 m_OverrideSceneCullingMask: 6917529027641081856 m_SceneIsLit: 1 @@ -651,9 +651,9 @@ MonoBehaviour: m_PlayAudio: 0 m_AudioPlay: 0 m_Position: - m_Target: {x: 1978.4015, y: 1389.1699, z: -4.6688995} + m_Target: {x: 1861.3319, y: 1708.45, z: 18.557688} speed: 2 - m_Value: {x: 2004.2833, y: 1391.6895, z: -3.9474201} + m_Value: {x: 1861.3319, y: 1708.45, z: 18.557688} m_RenderMode: 0 m_CameraMode: drawMode: 0 @@ -679,7 +679,7 @@ MonoBehaviour: m_Value: 0 m_Color: {r: 0.5, g: 0.5, b: 0.5, a: 0.4} m_Pivot: {x: 0, y: 0, z: 0} - m_Size: {x: 1, y: 1} + m_Size: {x: 0, y: 0} yGrid: m_Fade: m_Target: 0 @@ -687,7 +687,7 @@ MonoBehaviour: m_Value: 0 m_Color: {r: 0.5, g: 0.5, b: 0.5, a: 0.4} m_Pivot: {x: 0, y: 0, z: 0} - m_Size: {x: 1, y: 1} + m_Size: {x: 0, y: 0} zGrid: m_Fade: m_Target: 1 @@ -704,9 +704,9 @@ MonoBehaviour: speed: 2 m_Value: {x: 0, y: 0, z: 0, w: 1} m_Size: - m_Target: 1675.4497 + m_Target: 347.08093 speed: 2 - m_Value: 1603.3011 + m_Value: 347.08093 m_Ortho: m_Target: 1 speed: 2 @@ -751,9 +751,9 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 576.8 + x: 725.60004 y: 73.6 - width: 270.8 + width: 245.20001 height: 701.8 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: @@ -765,7 +765,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 808cffffd08cffff828dffff0a92ffff5492ffff8294ffffc6a5ffff10a6ffff3ea8ffff86daffff42ecffff52ecffff5eecffff26fbffff125f0000485f0000545f00007e5f00008a5f0000ae5f0000b85f0000c65f00000cd7000014d800003cd80000b0d8000098fd00009cfd0000d8fd0000 + m_ExpandedIDs: 8470ffffd070fffff872ffff1875ffff6875ffff1a76ffff7279ffffc279fffff07bffff3484ffff7e84ffffac86ffff26fbffffa413010090140100da140100862b0100443a0100a43b01001e3c0100683c0100 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -788,7 +788,7 @@ MonoBehaviour: m_LockTracker: m_IsLocked: 0 m_CurrentSortingName: TransformSorting - m_WindowGUID: 69aec9439f374234ebb7360b660b5efe + m_WindowGUID: 99901e27cd5d19b4693378468aaac437 --- !u!114 &15 MonoBehaviour: m_ObjectHideFlags: 52 @@ -809,9 +809,9 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 849.60004 + x: 972.8 y: 73.6 - width: 389.20007 + width: 218.00006 height: 701.8 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: @@ -829,23 +829,23 @@ MonoBehaviour: m_SkipHidden: 0 m_SearchArea: 1 m_Folders: - - Assets/Scripts + - Assets m_Globs: [] m_OriginalText: m_FilterByTypeIntersection: 0 m_ViewMode: 1 - m_StartGridSize: 16 + m_StartGridSize: 64 m_LastFolders: - - Assets/Scripts - m_LastFoldersGridSize: 16 + - Assets + m_LastFoldersGridSize: -1 m_LastProjectPath: C:\Users\A1891\Desktop\MyBookPage m_LockTracker: m_IsLocked: 0 m_FolderTreeState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: 2a620000 - m_LastClickedID: 25130 - m_ExpandedIDs: 0000000014620000ffffff7f + m_SelectedIDs: 70620000 + m_LastClickedID: 25200 + m_ExpandedIDs: 000000007062000086620000ffffff7f m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -861,7 +861,7 @@ MonoBehaviour: m_IsRenaming: 0 m_OriginalEventType: 11 m_IsRenamingFilename: 1 - m_ClientGUIView: {fileID: 10} + m_ClientGUIView: {fileID: 0} m_SearchString: m_CreateAssetUtility: m_EndAction: {fileID: 0} @@ -873,7 +873,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 0000000014620000ffffff7f + m_ExpandedIDs: 000000007062000086620000ffffff7f m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -901,7 +901,7 @@ MonoBehaviour: m_SelectedInstanceIDs: m_LastClickedInstanceID: 0 m_HadKeyboardFocusLastEvent: 0 - m_ExpandedInstanceIDs: 00000000228b0000d8890000 + m_ExpandedInstanceIDs: m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -917,7 +917,7 @@ MonoBehaviour: m_IsRenaming: 0 m_OriginalEventType: 11 m_IsRenamingFilename: 1 - m_ClientGUIView: {fileID: 10} + m_ClientGUIView: {fileID: 0} m_CreateAssetUtility: m_EndAction: {fileID: 0} m_InstanceID: 0 @@ -926,9 +926,9 @@ MonoBehaviour: m_ResourceFile: m_NewAssetIndexInList: -1 m_ScrollPosition: {x: 0, y: 0} - m_GridSize: 16 + m_GridSize: 64 m_SkipHiddenPackages: 0 - m_DirectoriesAreaWidth: 231.19998 + m_DirectoriesAreaWidth: 115 --- !u!114 &16 MonoBehaviour: m_ObjectHideFlags: 52 @@ -949,9 +949,9 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 1240.8 + x: 1192.8 y: 73.6 - width: 294.19995 + width: 342.19995 height: 701.8 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: