diff --git a/.vs/Place/v16/.suo b/.vs/Place/v16/.suo index 2eaf19d..1b3e96a 100644 Binary files a/.vs/Place/v16/.suo and b/.vs/Place/v16/.suo differ diff --git a/Assembly-CSharp.Player.csproj b/Assembly-CSharp.Player.csproj index a37b081..3de7337 100644 --- a/Assembly-CSharp.Player.csproj +++ b/Assembly-CSharp.Player.csproj @@ -616,6 +616,7 @@ + diff --git a/Assembly-CSharp.csproj b/Assembly-CSharp.csproj index 851cf6f..0d4f78a 100644 --- a/Assembly-CSharp.csproj +++ b/Assembly-CSharp.csproj @@ -67,6 +67,7 @@ + diff --git a/Assets/BuildSystem/Prefab/Car_1.prefab b/Assets/BuildSystem/Prefab/Car_1.prefab index dd40e83..0436014 100644 --- a/Assets/BuildSystem/Prefab/Car_1.prefab +++ b/Assets/BuildSystem/Prefab/Car_1.prefab @@ -10,6 +10,7 @@ GameObject: m_Component: - component: {fileID: 7208276842709008467} - component: {fileID: 3301075936692375341} + - component: {fileID: 4299306325991190111} m_Layer: 11 m_Name: forword m_TagString: CarFw @@ -39,11 +40,26 @@ BoxCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2071446745799645698} m_Material: {fileID: 0} - m_IsTrigger: 0 + m_IsTrigger: 1 m_Enabled: 1 serializedVersion: 2 - m_Size: {x: 3.3547106, y: 3.7294302, z: 3.4481072} + m_Size: {x: 2.25, y: 3.7294302, z: 3.4481072} m_Center: {x: 0.010766983, y: 1.3647146, z: -2.9882247} +--- !u!114 &4299306325991190111 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2071446745799645698} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3689746bc83294044b12b63906089155, type: 3} + m_Name: + m_EditorClassIdentifier: + errorPre: {fileID: 5019570328240517667, guid: 3912d4529bb901b4e85a4118b9e292b7, + type: 3} + error: {fileID: 0} --- !u!1 &3801302919178152479 GameObject: m_ObjectHideFlags: 0 @@ -83,7 +99,7 @@ BoxCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3801302919178152479} m_Material: {fileID: 0} - m_IsTrigger: 0 + m_IsTrigger: 1 m_Enabled: 1 serializedVersion: 2 m_Size: {x: 3.3547106, y: 3.7294302, z: 3.083209} @@ -338,6 +354,7 @@ GameObject: m_Component: - component: {fileID: 7784768132697937110} - component: {fileID: 7784768134556555210} + - component: {fileID: 8661806461174857295} m_Layer: 11 m_Name: Car_1 m_TagString: Car @@ -381,11 +398,28 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: fordir: {fileID: 7208276842709008467} + isTurnIng: 0 roadId: 0 curDir: 0 isCanMove: 1 isMoveEnd: 1 stupT: 0 +--- !u!54 &8661806461174857295 +Rigidbody: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7784768132697704694} + serializedVersion: 2 + m_Mass: 1 + m_Drag: 0 + m_AngularDrag: 0.05 + m_UseGravity: 0 + m_IsKinematic: 0 + m_Interpolate: 0 + m_Constraints: 0 + m_CollisionDetection: 0 --- !u!1 &7784768132697704696 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/BuildSystem/Prefab/error.prefab b/Assets/BuildSystem/Prefab/error.prefab new file mode 100644 index 0000000..c5e413c --- /dev/null +++ b/Assets/BuildSystem/Prefab/error.prefab @@ -0,0 +1,177 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &5019570327247823450 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5019570327247823449} + - component: {fileID: 5019570327247823448} + - component: {fileID: 5019570327247823451} + m_Layer: 0 + m_Name: New Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &5019570327247823449 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5019570327247823450} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -4.229999, y: -1.31, z: -0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 5019570328240517665} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 74.063, y: 0, z: 0} +--- !u!23 &5019570327247823448 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5019570327247823450} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: c72f41c163e2c914db2b89ee387cda74, type: 3} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 +--- !u!102 &5019570327247823451 +TextMesh: + serializedVersion: 3 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5019570327247823450} + m_Text: "\u68C0\u6D4B\u5230\u4E8B\u6545\uFF0C\n \u6B63\u5728\u5904\u7406" + m_OffsetZ: 0 + m_CharacterSize: 1 + m_LineSpacing: 1 + m_Anchor: 0 + m_Alignment: 0 + m_TabSize: 4 + m_FontSize: 0 + m_FontStyle: 0 + m_RichText: 1 + m_Font: {fileID: 12800000, guid: c72f41c163e2c914db2b89ee387cda74, type: 3} + m_Color: + serializedVersion: 2 + rgba: 4279045631 +--- !u!1 &5019570328240517667 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5019570328240517665} + - component: {fileID: 5019570328240517664} + m_Layer: 0 + m_Name: error + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &5019570328240517665 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5019570328240517667} + m_LocalRotation: {x: 0.6022573, y: -0, z: -0, w: 0.79830205} + m_LocalPosition: {x: 482.3, y: 5.45, z: 39.06} + m_LocalScale: {x: 3, y: 3, z: 3} + m_Children: + - {fileID: 5019570327247823449} + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 74.063, y: 0, z: 0} +--- !u!212 &5019570328240517664 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5019570328240517667} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_Sprite: {fileID: 21300000, guid: e0b9795defbf1ff4ea9f1069b4a0d1b8, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 3.67, y: 3.37} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 diff --git a/Assets/BuildSystem/Prefab/error.prefab.meta b/Assets/BuildSystem/Prefab/error.prefab.meta new file mode 100644 index 0000000..5b06305 --- /dev/null +++ b/Assets/BuildSystem/Prefab/error.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 3912d4529bb901b4e85a4118b9e292b7 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/BuildSystem/Scripts/BuildSystemManager.cs b/Assets/BuildSystem/Scripts/BuildSystemManager.cs index 2e0d517..fcfca10 100644 --- a/Assets/BuildSystem/Scripts/BuildSystemManager.cs +++ b/Assets/BuildSystem/Scripts/BuildSystemManager.cs @@ -92,14 +92,14 @@ namespace BuildSystem CreatePlaceSpecial(w[0], 0, 0); CreatePlaceSpecial(h2, 1, 0); CreatePlaceSpecial(h2, 2, 0); - CreatePlaceSpecial(t2up, 3, 0); - CreatePlaceSpecial(h2, 4, 0); + CreatePlaceSpecial(h2, 3, 0); + CreatePlaceSpecial(t2up, 4, 0); CreatePlaceSpecial(h2, 5, 0); CreatePlaceSpecial(h2, 6, 0); CreatePlaceSpecial(h2, 7, 0); CreatePlaceSpecial(h2, 8, 0); - CreatePlaceSpecial(h2, 9, 0); - CreatePlaceSpecial(t2up, 10, 0); + CreatePlaceSpecial(t2up, 9, 0); + CreatePlaceSpecial(h2, 10, 0); CreatePlaceSpecial(h2, 11, 0); CreatePlaceSpecial(h2, 12, 0); CreatePlaceSpecial(w[3], 13, 0); @@ -107,22 +107,22 @@ namespace BuildSystem CreatePlaceSpecial(w[1], 0, 7); CreatePlaceSpecial(h2, 1, 7); CreatePlaceSpecial(h2, 2, 7); - CreatePlaceSpecial(t2down, 3, 7); - CreatePlaceSpecial(h2, 4, 7); + CreatePlaceSpecial(h2, 3, 7); + CreatePlaceSpecial(t2down, 4, 7); CreatePlaceSpecial(h2, 5, 7); CreatePlaceSpecial(h2, 6, 7); CreatePlaceSpecial(h2, 7, 7); CreatePlaceSpecial(h2, 8, 7); - CreatePlaceSpecial(h2, 9, 7); - CreatePlaceSpecial(t2down, 10, 7); + CreatePlaceSpecial(t2down, 9, 7); + CreatePlaceSpecial(h2, 10, 7); CreatePlaceSpecial(h2, 11, 7); CreatePlaceSpecial(h2, 12, 7); CreatePlaceSpecial(w[2], 13, 7); CreatePlaceSpecial(v2, 0, 1); - CreatePlaceSpecial(t2right, 0, 2); - CreatePlaceSpecial(v2, 0, 3); + CreatePlaceSpecial(v2, 0, 2); + CreatePlaceSpecial(t2right, 0, 3); CreatePlaceSpecial(v2, 0, 4); CreatePlaceSpecial(v2, 0, 5); CreatePlaceSpecial(v2, 0, 6); @@ -131,32 +131,32 @@ namespace BuildSystem CreatePlaceSpecial(v2, 13, 1); CreatePlaceSpecial(v2, 13, 2); CreatePlaceSpecial(v2, 13, 3); - CreatePlaceSpecial(v2, 13, 4); - CreatePlaceSpecial(t2left, 13, 5); + CreatePlaceSpecial(t2left, 13, 4); + CreatePlaceSpecial(v2, 13, 5); CreatePlaceSpecial(v2, 13, 6); //特殊建筑 - gridMap[1][3].isPlace = true; - gridMap[7][5].isPlace = true; - gridMap[5][2].isPlace = true; + gridMap[2][4].isPlace = true; + gridMap[7][6].isPlace = true; + gridMap[5][3].isPlace = true; gridMap[8][2].isPlace = true; - gridMap[11][4].isPlace = true; + gridMap[11][3].isPlace = true; - gridMap[1][3].gridType = GridType.Special; - gridMap[7][5].gridType = GridType.Special; - gridMap[5][2].gridType = GridType.Special; + gridMap[2][4].gridType = GridType.Special; + gridMap[7][6].gridType = GridType.Special; + gridMap[5][3].gridType = GridType.Special; gridMap[8][2].gridType = GridType.Special; - gridMap[11][4].gridType = GridType.Special; + gridMap[11][3].gridType = GridType.Special; - AddGridInfo(3, 0); - AddGridInfo(10, 0); - AddGridInfo(3, 7); - AddGridInfo(10, 7); - AddGridInfo(0, 2); - AddGridInfo(13, 5); + AddGridInfo(4, 0); + AddGridInfo(9, 0); + AddGridInfo(4, 7); + AddGridInfo(9, 7); + AddGridInfo(0, 3); + AddGridInfo(13, 4); } void AddGridInfo(int x, int y) @@ -369,14 +369,14 @@ namespace BuildSystem private void Update() { - ////更新格子的相邻道路 - //for (int i = 0; i < mapSize.x; i++) - //{ - // for (int j = 0; j < mapSize.y; j++) - // { - // gridMap[i][j].InitGround(); - // } - //} + //更新格子的相邻道路 + for (int i = 0; i < mapSize.x; i++) + { + for (int j = 0; j < mapSize.y; j++) + { + gridMap[i][j].InitGround(); + } + } if (!oneStageEnd) { @@ -455,10 +455,6 @@ namespace BuildSystem redGreenLightEnd = true; Debug.Log("红绿灯放置阶段结束"); UIManager.Instance.TwoStageEnd(); - - StartCoroutine(Wait(()=> { - EduCoderTool.WebConnecter.Singleton.SendResultToWeb(true); - },2f)); } } } diff --git a/Assets/BuildSystem/Scripts/Car.cs b/Assets/BuildSystem/Scripts/Car.cs index 661987f..736d4fa 100644 --- a/Assets/BuildSystem/Scripts/Car.cs +++ b/Assets/BuildSystem/Scripts/Car.cs @@ -74,7 +74,6 @@ namespace BuildSystem if (raycastHit.collider.tag == "CarFr") { isCanMove = false; - //stupT += Time.deltaTime; } else { isCanMove = true; @@ -100,13 +99,18 @@ namespace BuildSystem } } - + //停止运动销毁 - //if (stupT > 15) + //if (!isCanMove) //{ - // CarController.Instance.number--; - // Destroy(gameObject); + // if (raycastHit.collider.tag == "CarFr") + // { + // if (Vector3.Distance(transform.position, raycastHit.collider.gameObject.transform.position) < 5f) + // { + // Destroy(gameObject); + // } + // } //} } @@ -243,5 +247,7 @@ namespace BuildSystem now = new Vector2Int(nextGird.x, nextGird.z); isMoveEnd = true; } + + } } diff --git a/Assets/BuildSystem/Scripts/CarCollision.cs b/Assets/BuildSystem/Scripts/CarCollision.cs new file mode 100644 index 0000000..3ddd567 --- /dev/null +++ b/Assets/BuildSystem/Scripts/CarCollision.cs @@ -0,0 +1,39 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; +using System; + +namespace BuildSystem +{ + public class CarCollision : MonoBehaviour + { + public GameObject errorPre; + public GameObject error=null; + private void OnTriggerEnter(Collider other) + { + if (other.tag == "CarFw") + + { + if (error!=null) return; + error = Instantiate(errorPre, (transform.position + other.transform.position) * 0.5f, Quaternion.identity); + error.transform.localEulerAngles += new Vector3(90, 0, 0); + error.transform.position += new Vector3(0, 5, 0); + StartCoroutine(Wait(()=> { + ClearError(); + },5f)); + Debug.Log("撞车"); + } + } + IEnumerator Wait(Action action,float t) { + yield return new WaitForSeconds(t); + action(); + } + + void ClearError() + + { + Destroy(error); + CarController.Instance.ClearCar(transform.parent.GetComponent()); + } + } +} diff --git a/Assets/BuildSystem/Scripts/CarCollision.cs.meta b/Assets/BuildSystem/Scripts/CarCollision.cs.meta new file mode 100644 index 0000000..25397af --- /dev/null +++ b/Assets/BuildSystem/Scripts/CarCollision.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 3689746bc83294044b12b63906089155 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/BuildSystem/Scripts/CarController.cs b/Assets/BuildSystem/Scripts/CarController.cs index ca13ce0..c64c0a5 100644 --- a/Assets/BuildSystem/Scripts/CarController.cs +++ b/Assets/BuildSystem/Scripts/CarController.cs @@ -24,8 +24,8 @@ namespace BuildSystem void Start() { birth.Add(new Vector2Int(0 , 2)); - birth.Add(new Vector2Int(10, 0)); - birth.Add(new Vector2Int(13, 5)); + birth.Add(new Vector2Int(13, 3)); + //birth.Add(new Vector2Int(13, 4)); } /// @@ -68,8 +68,16 @@ namespace BuildSystem } } + public void ClearCar(Car car) { + allCar.Remove(car); + Destroy(car.gameObject); + number--; + } + public void CarNumberChange(float num) { - carNumber = (int)(num * 70) + 30; + carNumber = (int)(num * 30) + 30; } + + } } diff --git a/Assets/BuildSystem/Scripts/UI/UIManager.cs b/Assets/BuildSystem/Scripts/UI/UIManager.cs index 62ef027..b31465b 100644 --- a/Assets/BuildSystem/Scripts/UI/UIManager.cs +++ b/Assets/BuildSystem/Scripts/UI/UIManager.cs @@ -2,6 +2,7 @@ using System.Collections.Generic; using UnityEngine; using UnityEngine.UI; +using System; namespace BuildSystem { public class UIManager : MonoSingleton @@ -32,6 +33,9 @@ namespace BuildSystem carRun.onClick.AddListener(()=> { CarController.Instance.StartCreateCar(); carRun.gameObject.SetActive(false); + StartCoroutine(Wait(()=> { + EduCoderTool.WebConnecter.Singleton.SendResultToWeb(true); + },30f)); }); carSlider.onValueChanged.AddListener(CarController.Instance.CarNumberChange); @@ -71,5 +75,13 @@ namespace BuildSystem obj.GetComponent().renderGrid = renderGrid; } } + + IEnumerator Wait(Action action, float t) + { + yield return new WaitForSeconds(t); + action(); + } + + } } diff --git a/Assets/BuildSystem/img/810d399a1b78b4b307f31b49f72c3e7.png b/Assets/BuildSystem/img/810d399a1b78b4b307f31b49f72c3e7.png new file mode 100644 index 0000000..5da7c75 Binary files /dev/null and b/Assets/BuildSystem/img/810d399a1b78b4b307f31b49f72c3e7.png differ diff --git a/Assets/BuildSystem/img/810d399a1b78b4b307f31b49f72c3e7.png.meta b/Assets/BuildSystem/img/810d399a1b78b4b307f31b49f72c3e7.png.meta new file mode 100644 index 0000000..7774172 --- /dev/null +++ b/Assets/BuildSystem/img/810d399a1b78b4b307f31b49f72c3e7.png.meta @@ -0,0 +1,116 @@ +fileFormatVersion: 2 +guid: e0b9795defbf1ff4ea9f1069b4a0d1b8 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: -1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/BuildSystem/img/未标题-1.png b/Assets/BuildSystem/img/未标题-1.png new file mode 100644 index 0000000..316340a Binary files /dev/null and b/Assets/BuildSystem/img/未标题-1.png differ diff --git a/Assets/BuildSystem/img/未标题-1.png.meta b/Assets/BuildSystem/img/未标题-1.png.meta new file mode 100644 index 0000000..08bae9d --- /dev/null +++ b/Assets/BuildSystem/img/未标题-1.png.meta @@ -0,0 +1,116 @@ +fileFormatVersion: 2 +guid: 25ed176ab8d75ff4d809b528119e1ec5 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: -1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Changjing/Prefabs/Ding/T2Left.prefab b/Assets/Changjing/Prefabs/Ding/T2Left.prefab index 1bb525c..b358eb4 100644 --- a/Assets/Changjing/Prefabs/Ding/T2Left.prefab +++ b/Assets/Changjing/Prefabs/Ding/T2Left.prefab @@ -528,80 +528,6 @@ Transform: m_Father: {fileID: 3232928836406370507} m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &2923023152416124511 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 7765138599782378272} - - component: {fileID: 1359540515956652407} - m_Layer: 0 - m_Name: Camera - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &7765138599782378272 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2923023152416124511} - m_LocalRotation: {x: 0.6743797, y: -0.6743797, z: -0.21263112, w: 0.21263112} - m_LocalPosition: {x: 23.24, y: -0.1, z: 22.63} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 8339950437086525092} - m_RootOrder: 4 - m_LocalEulerAnglesHint: {x: 0, y: -145, z: -90.00001} ---- !u!20 &1359540515956652407 -Camera: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2923023152416124511} - m_Enabled: 1 - serializedVersion: 2 - m_ClearFlags: 1 - m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0} - m_projectionMatrixMode: 1 - m_GateFitMode: 2 - m_FOVAxisMode: 0 - m_SensorSize: {x: 36, y: 24} - m_LensShift: {x: 0, y: 0} - m_FocalLength: 50 - m_NormalizedViewPortRect: - serializedVersion: 2 - x: 0 - y: 0 - width: 1 - height: 1 - near clip plane: 0.3 - far clip plane: 1000 - field of view: 60 - orthographic: 0 - orthographic size: 5 - m_Depth: 0 - m_CullingMask: - serializedVersion: 2 - m_Bits: 4294967295 - m_RenderingPath: -1 - m_TargetTexture: {fileID: 0} - m_TargetDisplay: 0 - m_TargetEye: 3 - m_HDR: 1 - m_AllowMSAA: 1 - m_AllowDynamicResolution: 0 - m_ForceIntoRT: 0 - m_OcclusionCulling: 1 - m_StereoConvergence: 10 - m_StereoSeparation: 0.022 --- !u!1 &3235841829779944150 GameObject: m_ObjectHideFlags: 0 @@ -694,6 +620,80 @@ Transform: m_Father: {fileID: 8339950437086525092} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &3770815797918278372 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 422905931519165761} + - component: {fileID: 3231642003386060986} + m_Layer: 0 + m_Name: Camera (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &422905931519165761 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3770815797918278372} + m_LocalRotation: {x: 0.6532815, y: 0.6532815, z: 0.27059802, w: 0.27059802} + m_LocalPosition: {x: -25.040009, y: 0, z: 18.180008} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 8339950437086525092} + m_RootOrder: 5 + m_LocalEulerAnglesHint: {x: 135, y: 0, z: 0} +--- !u!20 &3231642003386060986 +Camera: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3770815797918278372} + m_Enabled: 1 + serializedVersion: 2 + m_ClearFlags: 1 + m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0} + m_projectionMatrixMode: 1 + m_GateFitMode: 2 + m_FOVAxisMode: 0 + m_SensorSize: {x: 36, y: 24} + m_LensShift: {x: 0, y: 0} + m_FocalLength: 50 + m_NormalizedViewPortRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 + near clip plane: 0.3 + far clip plane: 1000 + field of view: 60 + orthographic: 0 + orthographic size: 5 + m_Depth: 0 + m_CullingMask: + serializedVersion: 2 + m_Bits: 4294967295 + m_RenderingPath: -1 + m_TargetTexture: {fileID: 0} + m_TargetDisplay: 0 + m_TargetEye: 3 + m_HDR: 1 + m_AllowMSAA: 1 + m_AllowDynamicResolution: 0 + m_ForceIntoRT: 0 + m_OcclusionCulling: 1 + m_StereoConvergence: 10 + m_StereoSeparation: 0.022 --- !u!1 &3889795002874933183 GameObject: m_ObjectHideFlags: 0 @@ -1590,7 +1590,7 @@ Transform: - {fileID: 8760894637111253391} - {fileID: 666127519873193601} m_Father: {fileID: 8339950437086525092} - m_RootOrder: 5 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &7835360769726998992 GameObject: @@ -1842,8 +1842,8 @@ Transform: - {fileID: 3462038271744026870} - {fileID: 8220158498852504502} - {fileID: 8535007929614287798} - - {fileID: 7765138599782378272} - {fileID: 4337101108306079962} + - {fileID: 422905931519165761} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: -90.00001, y: 0, z: 270} @@ -1945,7 +1945,7 @@ MonoBehaviour: LeftUp1: {fileID: 0} LeftUp2: {fileID: 0} LeftUp3: {fileID: 0} - camera: {fileID: 1359540515956652407} + camera: {fileID: 3231642003386060986} --- !u!1 &8943674777473797873 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Changjing/Prefabs/Ding/T2Right.prefab b/Assets/Changjing/Prefabs/Ding/T2Right.prefab index 70e7a39..5b33ae9 100644 --- a/Assets/Changjing/Prefabs/Ding/T2Right.prefab +++ b/Assets/Changjing/Prefabs/Ding/T2Right.prefab @@ -194,7 +194,7 @@ Transform: - {fileID: 744522354915336188} - {fileID: 6270286273983862973} m_Father: {fileID: 8339950437086525092} - m_RootOrder: 5 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1226239836270952304 GameObject: @@ -547,80 +547,6 @@ Transform: m_Father: {fileID: 9013279186597868447} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &2916235016141029188 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1926975948842599881} - - component: {fileID: 1552269047401256851} - m_Layer: 0 - m_Name: Camera - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1926975948842599881 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2916235016141029188} - m_LocalRotation: {x: 0.6865373, y: 0.6865373, z: 0.1693119, w: 0.1693119} - m_LocalPosition: {x: -18.3, y: -0.7, z: 28.7} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 8339950437086525092} - m_RootOrder: 4 - m_LocalEulerAnglesHint: {x: 180, y: -27.70697, z: -90} ---- !u!20 &1552269047401256851 -Camera: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2916235016141029188} - m_Enabled: 1 - serializedVersion: 2 - m_ClearFlags: 1 - m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0} - m_projectionMatrixMode: 1 - m_GateFitMode: 2 - m_FOVAxisMode: 0 - m_SensorSize: {x: 36, y: 24} - m_LensShift: {x: 0, y: 0} - m_FocalLength: 50 - m_NormalizedViewPortRect: - serializedVersion: 2 - x: 0 - y: 0 - width: 1 - height: 1 - near clip plane: 0.3 - far clip plane: 1000 - field of view: 60 - orthographic: 0 - orthographic size: 5 - m_Depth: 0 - m_CullingMask: - serializedVersion: 2 - m_Bits: 4294967295 - m_RenderingPath: -1 - m_TargetTexture: {fileID: 0} - m_TargetDisplay: 0 - m_TargetEye: 3 - m_HDR: 1 - m_AllowMSAA: 1 - m_AllowDynamicResolution: 0 - m_ForceIntoRT: 0 - m_OcclusionCulling: 1 - m_StereoConvergence: 10 - m_StereoSeparation: 0.022 --- !u!1 &3006853496214293150 GameObject: m_ObjectHideFlags: 0 @@ -983,6 +909,80 @@ Transform: m_Father: {fileID: 2595648983529324023} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &5011565616204618878 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2763765900124433335} + - component: {fileID: 5741598695726462960} + m_Layer: 0 + m_Name: Camera (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2763765900124433335 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5011565616204618878} + m_LocalRotation: {x: -0.6532815, y: 0.6532815, z: 0.27059802, w: -0.27059802} + m_LocalPosition: {x: 25.040009, y: 0, z: 18.180008} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 8339950437086525092} + m_RootOrder: 5 + m_LocalEulerAnglesHint: {x: 135, y: 0, z: 0} +--- !u!20 &5741598695726462960 +Camera: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5011565616204618878} + m_Enabled: 1 + serializedVersion: 2 + m_ClearFlags: 1 + m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0} + m_projectionMatrixMode: 1 + m_GateFitMode: 2 + m_FOVAxisMode: 0 + m_SensorSize: {x: 36, y: 24} + m_LensShift: {x: 0, y: 0} + m_FocalLength: 50 + m_NormalizedViewPortRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 + near clip plane: 0.3 + far clip plane: 1000 + field of view: 60 + orthographic: 0 + orthographic size: 5 + m_Depth: 0 + m_CullingMask: + serializedVersion: 2 + m_Bits: 4294967295 + m_RenderingPath: -1 + m_TargetTexture: {fileID: 0} + m_TargetDisplay: 0 + m_TargetEye: 3 + m_HDR: 1 + m_AllowMSAA: 1 + m_AllowDynamicResolution: 0 + m_ForceIntoRT: 0 + m_OcclusionCulling: 1 + m_StereoConvergence: 10 + m_StereoSeparation: 0.022 --- !u!1 &5102369646872475262 GameObject: m_ObjectHideFlags: 0 @@ -1842,8 +1842,8 @@ Transform: - {fileID: 5139301765707139410} - {fileID: 7183640936154015715} - {fileID: 267773995120736685} - - {fileID: 1926975948842599881} - {fileID: 8957686675948539619} + - {fileID: 2763765900124433335} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: -90.00001, y: 0, z: 90} @@ -1945,7 +1945,7 @@ MonoBehaviour: LeftUp1: {fileID: 6270286273983862973} LeftUp2: {fileID: 0} LeftUp3: {fileID: 0} - camera: {fileID: 1552269047401256851} + camera: {fileID: 5741598695726462960} --- !u!1 &8717264755339336385 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Changjing/Prefabs/Ding/T3Left.prefab b/Assets/Changjing/Prefabs/Ding/T3Left.prefab index 8bb1b01..d0006fe 100644 --- a/Assets/Changjing/Prefabs/Ding/T3Left.prefab +++ b/Assets/Changjing/Prefabs/Ding/T3Left.prefab @@ -676,8 +676,8 @@ Transform: - {fileID: 3119713419534237451} - {fileID: 149013525884695405} - {fileID: 693370193805265985} - - {fileID: 1544002383513439544} - {fileID: 2055161389248468779} + - {fileID: 7016650604171268877} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: -90.00001, y: 0, z: 270} @@ -779,7 +779,7 @@ MonoBehaviour: LeftUp1: {fileID: 0} LeftUp2: {fileID: 0} LeftUp3: {fileID: 0} - camera: {fileID: 5390977667922214845} + camera: {fileID: 3440617572702221695} --- !u!1 &1988993541100415505 GameObject: m_ObjectHideFlags: 0 @@ -1040,7 +1040,7 @@ Transform: - {fileID: 7827193861662868944} - {fileID: 84298244332614232} m_Father: {fileID: 1158122193222068242} - m_RootOrder: 5 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &2897012088719791328 GameObject: @@ -1372,6 +1372,80 @@ Transform: m_Father: {fileID: 4976324358771145786} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &3561525388580938350 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7016650604171268877} + - component: {fileID: 3440617572702221695} + m_Layer: 0 + m_Name: Camera (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &7016650604171268877 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3561525388580938350} + m_LocalRotation: {x: 0.6532815, y: 0.6532815, z: 0.27059802, w: 0.27059802} + m_LocalPosition: {x: -25.040009, y: 0, z: 18.180008} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 1158122193222068242} + m_RootOrder: 5 + m_LocalEulerAnglesHint: {x: 135, y: 0, z: 0} +--- !u!20 &3440617572702221695 +Camera: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3561525388580938350} + m_Enabled: 1 + serializedVersion: 2 + m_ClearFlags: 1 + m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0} + m_projectionMatrixMode: 1 + m_GateFitMode: 2 + m_FOVAxisMode: 0 + m_SensorSize: {x: 36, y: 24} + m_LensShift: {x: 0, y: 0} + m_FocalLength: 50 + m_NormalizedViewPortRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 + near clip plane: 0.3 + far clip plane: 1000 + field of view: 60 + orthographic: 0 + orthographic size: 5 + m_Depth: 0 + m_CullingMask: + serializedVersion: 2 + m_Bits: 4294967295 + m_RenderingPath: -1 + m_TargetTexture: {fileID: 0} + m_TargetDisplay: 0 + m_TargetEye: 3 + m_HDR: 1 + m_AllowMSAA: 1 + m_AllowDynamicResolution: 0 + m_ForceIntoRT: 0 + m_OcclusionCulling: 1 + m_StereoConvergence: 10 + m_StereoSeparation: 0.022 --- !u!1 &3572099275295249155 GameObject: m_ObjectHideFlags: 0 @@ -2162,80 +2236,6 @@ Transform: m_Father: {fileID: 6826490286859175882} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &6281267581717460011 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1544002383513439544} - - component: {fileID: 5390977667922214845} - m_Layer: 0 - m_Name: Camera - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1544002383513439544 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6281267581717460011} - m_LocalRotation: {x: 0.6743797, y: -0.6743797, z: -0.21263112, w: 0.21263112} - m_LocalPosition: {x: 23.24, y: -0.1, z: 22.63} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 1158122193222068242} - m_RootOrder: 4 - m_LocalEulerAnglesHint: {x: 0, y: -145, z: -90.00001} ---- !u!20 &5390977667922214845 -Camera: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6281267581717460011} - m_Enabled: 1 - serializedVersion: 2 - m_ClearFlags: 1 - m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0} - m_projectionMatrixMode: 1 - m_GateFitMode: 2 - m_FOVAxisMode: 0 - m_SensorSize: {x: 36, y: 24} - m_LensShift: {x: 0, y: 0} - m_FocalLength: 50 - m_NormalizedViewPortRect: - serializedVersion: 2 - x: 0 - y: 0 - width: 1 - height: 1 - near clip plane: 0.3 - far clip plane: 1000 - field of view: 60 - orthographic: 0 - orthographic size: 5 - m_Depth: 0 - m_CullingMask: - serializedVersion: 2 - m_Bits: 4294967295 - m_RenderingPath: -1 - m_TargetTexture: {fileID: 0} - m_TargetDisplay: 0 - m_TargetEye: 3 - m_HDR: 1 - m_AllowMSAA: 1 - m_AllowDynamicResolution: 0 - m_ForceIntoRT: 0 - m_OcclusionCulling: 1 - m_StereoConvergence: 10 - m_StereoSeparation: 0.022 --- !u!1 &6334876547663173637 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Changjing/Prefabs/Ding/T3Right.prefab b/Assets/Changjing/Prefabs/Ding/T3Right.prefab index 00ffdd6..a635060 100644 --- a/Assets/Changjing/Prefabs/Ding/T3Right.prefab +++ b/Assets/Changjing/Prefabs/Ding/T3Right.prefab @@ -616,8 +616,8 @@ Transform: - {fileID: 9181631655881387394} - {fileID: 5971216333119329530} - {fileID: 5451696835700800936} - - {fileID: 4849785412879156011} - {fileID: 7463493205654973248} + - {fileID: 3109548148969649113} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: -90.00001, y: 0, z: 90} @@ -719,7 +719,7 @@ MonoBehaviour: LeftUp1: {fileID: 6626155407983066785} LeftUp2: {fileID: 2836926937997258225} LeftUp3: {fileID: 0} - camera: {fileID: 3159202730400035084} + camera: {fileID: 3903033499427344810} --- !u!1 &2162141164248777994 GameObject: m_ObjectHideFlags: 0 @@ -881,6 +881,80 @@ Transform: m_Father: {fileID: 7463493205654973248} m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &2489773873484902895 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3109548148969649113} + - component: {fileID: 3903033499427344810} + m_Layer: 0 + m_Name: Camera + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &3109548148969649113 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2489773873484902895} + m_LocalRotation: {x: -0.6532815, y: 0.6532815, z: 0.27059802, w: -0.27059802} + m_LocalPosition: {x: 25.040009, y: 0, z: 18.180008} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 1158122193222068242} + m_RootOrder: 5 + m_LocalEulerAnglesHint: {x: 135, y: 0, z: 0} +--- !u!20 &3903033499427344810 +Camera: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2489773873484902895} + m_Enabled: 1 + serializedVersion: 2 + m_ClearFlags: 1 + m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0} + m_projectionMatrixMode: 1 + m_GateFitMode: 2 + m_FOVAxisMode: 0 + m_SensorSize: {x: 36, y: 24} + m_LensShift: {x: 0, y: 0} + m_FocalLength: 50 + m_NormalizedViewPortRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 + near clip plane: 0.3 + far clip plane: 1000 + field of view: 60 + orthographic: 0 + orthographic size: 5 + m_Depth: 0 + m_CullingMask: + serializedVersion: 2 + m_Bits: 4294967295 + m_RenderingPath: -1 + m_TargetTexture: {fileID: 0} + m_TargetDisplay: 0 + m_TargetEye: 3 + m_HDR: 1 + m_AllowMSAA: 1 + m_AllowDynamicResolution: 0 + m_ForceIntoRT: 0 + m_OcclusionCulling: 1 + m_StereoConvergence: 10 + m_StereoSeparation: 0.022 --- !u!1 &2538193363078918265 GameObject: m_ObjectHideFlags: 0 @@ -2566,80 +2640,6 @@ Transform: m_Father: {fileID: 8067288929640719835} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &7773330595004360803 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4849785412879156011} - - component: {fileID: 3159202730400035084} - m_Layer: 8 - m_Name: Camera - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &4849785412879156011 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7773330595004360803} - m_LocalRotation: {x: 0.6865373, y: 0.6865373, z: 0.1693119, w: 0.1693119} - m_LocalPosition: {x: -18.3, y: -0.7, z: 28.7} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 1158122193222068242} - m_RootOrder: 4 - m_LocalEulerAnglesHint: {x: 180, y: -27.70697, z: -90} ---- !u!20 &3159202730400035084 -Camera: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7773330595004360803} - m_Enabled: 1 - serializedVersion: 2 - m_ClearFlags: 1 - m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0} - m_projectionMatrixMode: 1 - m_GateFitMode: 2 - m_FOVAxisMode: 0 - m_SensorSize: {x: 36, y: 24} - m_LensShift: {x: 0, y: 0} - m_FocalLength: 50 - m_NormalizedViewPortRect: - serializedVersion: 2 - x: 0 - y: 0 - width: 1 - height: 1 - near clip plane: 0.3 - far clip plane: 1000 - field of view: 60 - orthographic: 0 - orthographic size: 5 - m_Depth: 0 - m_CullingMask: - serializedVersion: 2 - m_Bits: 4294967295 - m_RenderingPath: -1 - m_TargetTexture: {fileID: 0} - m_TargetDisplay: 0 - m_TargetEye: 3 - m_HDR: 1 - m_AllowMSAA: 1 - m_AllowDynamicResolution: 0 - m_ForceIntoRT: 0 - m_OcclusionCulling: 1 - m_StereoConvergence: 10 - m_StereoSeparation: 0.022 --- !u!1 &7819680859311299832 GameObject: m_ObjectHideFlags: 0 @@ -2784,7 +2784,7 @@ Transform: - {fileID: 6626155407983066785} - {fileID: 2836926937997258225} m_Father: {fileID: 1158122193222068242} - m_RootOrder: 5 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &8332771764021920022 GameObject: diff --git a/Assets/Changjing/Prefabs/T2-3/T23Left.prefab b/Assets/Changjing/Prefabs/T2-3/T23Left.prefab index 3eecec6..9ae53d9 100644 --- a/Assets/Changjing/Prefabs/T2-3/T23Left.prefab +++ b/Assets/Changjing/Prefabs/T2-3/T23Left.prefab @@ -803,6 +803,80 @@ Transform: m_Father: {fileID: 8214151754756876964} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &3066582672180732413 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4199824686163581578} + - component: {fileID: 3919948300079351693} + m_Layer: 0 + m_Name: Camera + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4199824686163581578 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3066582672180732413} + m_LocalRotation: {x: 0.6532815, y: 0.6532815, z: 0.27059802, w: 0.27059802} + m_LocalPosition: {x: -25.040009, y: 0, z: 18.180008} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 8189192162428827414} + m_RootOrder: 5 + m_LocalEulerAnglesHint: {x: 135, y: 0, z: 0} +--- !u!20 &3919948300079351693 +Camera: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3066582672180732413} + m_Enabled: 1 + serializedVersion: 2 + m_ClearFlags: 1 + m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0} + m_projectionMatrixMode: 1 + m_GateFitMode: 2 + m_FOVAxisMode: 0 + m_SensorSize: {x: 36, y: 24} + m_LensShift: {x: 0, y: 0} + m_FocalLength: 50 + m_NormalizedViewPortRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 + near clip plane: 0.3 + far clip plane: 1000 + field of view: 60 + orthographic: 0 + orthographic size: 5 + m_Depth: 0 + m_CullingMask: + serializedVersion: 2 + m_Bits: 4294967295 + m_RenderingPath: -1 + m_TargetTexture: {fileID: 0} + m_TargetDisplay: 0 + m_TargetEye: 3 + m_HDR: 1 + m_AllowMSAA: 1 + m_AllowDynamicResolution: 0 + m_ForceIntoRT: 0 + m_OcclusionCulling: 1 + m_StereoConvergence: 10 + m_StereoSeparation: 0.022 --- !u!1 &3109662579404342308 GameObject: m_ObjectHideFlags: 0 @@ -1269,82 +1343,8 @@ Transform: - {fileID: 8214151754756876964} - {fileID: 5778547591073362812} m_Father: {fileID: 8189192162428827414} - m_RootOrder: 5 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &5513644421096537175 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 8807773060094911336} - - component: {fileID: 5939893672695256205} - m_Layer: 0 - m_Name: Camera - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &8807773060094911336 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5513644421096537175} - m_LocalRotation: {x: 0.6743797, y: -0.6743797, z: -0.21263112, w: 0.21263112} - m_LocalPosition: {x: 23.24, y: -0.1, z: 22.63} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 8189192162428827414} m_RootOrder: 4 - m_LocalEulerAnglesHint: {x: 0, y: -145, z: -90.00001} ---- !u!20 &5939893672695256205 -Camera: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5513644421096537175} - m_Enabled: 1 - serializedVersion: 2 - m_ClearFlags: 1 - m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0} - m_projectionMatrixMode: 1 - m_GateFitMode: 2 - m_FOVAxisMode: 0 - m_SensorSize: {x: 36, y: 24} - m_LensShift: {x: 0, y: 0} - m_FocalLength: 50 - m_NormalizedViewPortRect: - serializedVersion: 2 - x: 0 - y: 0 - width: 1 - height: 1 - near clip plane: 0.3 - far clip plane: 1000 - field of view: 60 - orthographic: 0 - orthographic size: 5 - m_Depth: 0 - m_CullingMask: - serializedVersion: 2 - m_Bits: 4294967295 - m_RenderingPath: -1 - m_TargetTexture: {fileID: 0} - m_TargetDisplay: 0 - m_TargetEye: 3 - m_HDR: 1 - m_AllowMSAA: 1 - m_AllowDynamicResolution: 0 - m_ForceIntoRT: 0 - m_OcclusionCulling: 1 - m_StereoConvergence: 10 - m_StereoSeparation: 0.022 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &5989261602726365640 GameObject: m_ObjectHideFlags: 0 @@ -2087,8 +2087,8 @@ Transform: - {fileID: 7144711095121457996} - {fileID: 5329618604996381251} - {fileID: 4798499295363573484} - - {fileID: 8807773060094911336} - {fileID: 8103209247982977948} + - {fileID: 4199824686163581578} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: -90.00001, y: 0, z: 270} @@ -2190,7 +2190,7 @@ MonoBehaviour: LeftUp1: {fileID: 0} LeftUp2: {fileID: 0} LeftUp3: {fileID: 0} - camera: {fileID: 5939893672695256205} + camera: {fileID: 3919948300079351693} --- !u!1 &8867192897217667645 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Changjing/Prefabs/T2-3/T23Right.prefab b/Assets/Changjing/Prefabs/T2-3/T23Right.prefab index 10006b6..6d0f862 100644 --- a/Assets/Changjing/Prefabs/T2-3/T23Right.prefab +++ b/Assets/Changjing/Prefabs/T2-3/T23Right.prefab @@ -1,79 +1,5 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!1 &6328083012439963 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 3106936839264086300} - - component: {fileID: 2312110882661350167} - m_Layer: 0 - m_Name: Camera - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &3106936839264086300 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6328083012439963} - m_LocalRotation: {x: 0.6865373, y: 0.6865373, z: 0.1693119, w: 0.1693119} - m_LocalPosition: {x: -18.3, y: -0.7, z: 28.7} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 8189192162428827414} - m_RootOrder: 4 - m_LocalEulerAnglesHint: {x: 180, y: -27.70697, z: -90} ---- !u!20 &2312110882661350167 -Camera: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6328083012439963} - m_Enabled: 1 - serializedVersion: 2 - m_ClearFlags: 1 - m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0} - m_projectionMatrixMode: 1 - m_GateFitMode: 2 - m_FOVAxisMode: 0 - m_SensorSize: {x: 36, y: 24} - m_LensShift: {x: 0, y: 0} - m_FocalLength: 50 - m_NormalizedViewPortRect: - serializedVersion: 2 - x: 0 - y: 0 - width: 1 - height: 1 - near clip plane: 0.3 - far clip plane: 1000 - field of view: 60 - orthographic: 0 - orthographic size: 5 - m_Depth: 0 - m_CullingMask: - serializedVersion: 2 - m_Bits: 4294967295 - m_RenderingPath: -1 - m_TargetTexture: {fileID: 0} - m_TargetDisplay: 0 - m_TargetEye: 3 - m_HDR: 1 - m_AllowMSAA: 1 - m_AllowDynamicResolution: 0 - m_ForceIntoRT: 0 - m_OcclusionCulling: 1 - m_StereoConvergence: 10 - m_StereoSeparation: 0.022 --- !u!1 &173966415473898521 GameObject: m_ObjectHideFlags: 0 @@ -994,7 +920,7 @@ Transform: - {fileID: 4741768820465887173} - {fileID: 1116163201817352788} m_Father: {fileID: 8189192162428827414} - m_RootOrder: 5 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &2663388630386685074 GameObject: @@ -1899,6 +1825,80 @@ Transform: m_Father: {fileID: 1719266727817779489} m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &5610157439593654366 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4249621932494660798} + - component: {fileID: 4864686635933182670} + m_Layer: 0 + m_Name: Camera + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4249621932494660798 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5610157439593654366} + m_LocalRotation: {x: -0.6532815, y: 0.6532815, z: 0.27059802, w: -0.27059802} + m_LocalPosition: {x: 25.040009, y: 0, z: 18.180008} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 8189192162428827414} + m_RootOrder: 5 + m_LocalEulerAnglesHint: {x: 135, y: 0, z: 0} +--- !u!20 &4864686635933182670 +Camera: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5610157439593654366} + m_Enabled: 1 + serializedVersion: 2 + m_ClearFlags: 1 + m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0} + m_projectionMatrixMode: 1 + m_GateFitMode: 2 + m_FOVAxisMode: 0 + m_SensorSize: {x: 36, y: 24} + m_LensShift: {x: 0, y: 0} + m_FocalLength: 50 + m_NormalizedViewPortRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 + near clip plane: 0.3 + far clip plane: 1000 + field of view: 60 + orthographic: 0 + orthographic size: 5 + m_Depth: 0 + m_CullingMask: + serializedVersion: 2 + m_Bits: 4294967295 + m_RenderingPath: -1 + m_TargetTexture: {fileID: 0} + m_TargetDisplay: 0 + m_TargetEye: 3 + m_HDR: 1 + m_AllowMSAA: 1 + m_AllowDynamicResolution: 0 + m_ForceIntoRT: 0 + m_OcclusionCulling: 1 + m_StereoConvergence: 10 + m_StereoSeparation: 0.022 --- !u!1 &5918065517702538691 GameObject: m_ObjectHideFlags: 0 @@ -2336,8 +2336,8 @@ Transform: - {fileID: 7968678391769787829} - {fileID: 9135091558369902199} - {fileID: 3765228553522080402} - - {fileID: 3106936839264086300} - {fileID: 7255749381592496979} + - {fileID: 4249621932494660798} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: -90.00001, y: 0, z: 90} @@ -2439,7 +2439,7 @@ MonoBehaviour: LeftUp1: {fileID: 4741768820465887173} LeftUp2: {fileID: 1116163201817352788} LeftUp3: {fileID: 0} - camera: {fileID: 2312110882661350167} + camera: {fileID: 4864686635933182670} --- !u!1 &9045798606454636219 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Changjing/Prefabs/T3-2/T32Left.prefab b/Assets/Changjing/Prefabs/T3-2/T32Left.prefab index d07179f..45be344 100644 --- a/Assets/Changjing/Prefabs/T3-2/T32Left.prefab +++ b/Assets/Changjing/Prefabs/T3-2/T32Left.prefab @@ -452,80 +452,6 @@ Transform: m_Father: {fileID: 7552559077541505365} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &2058929069930257101 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4406595736713743741} - - component: {fileID: 4125975049468457189} - m_Layer: 0 - m_Name: Camera - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &4406595736713743741 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2058929069930257101} - m_LocalRotation: {x: 0.6743797, y: -0.6743797, z: -0.21263112, w: 0.21263112} - m_LocalPosition: {x: 23.24, y: -0.1, z: 22.63} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 7741631901276769502} - m_RootOrder: 4 - m_LocalEulerAnglesHint: {x: 0, y: -145, z: -90.00001} ---- !u!20 &4125975049468457189 -Camera: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2058929069930257101} - m_Enabled: 1 - serializedVersion: 2 - m_ClearFlags: 1 - m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0} - m_projectionMatrixMode: 1 - m_GateFitMode: 2 - m_FOVAxisMode: 0 - m_SensorSize: {x: 36, y: 24} - m_LensShift: {x: 0, y: 0} - m_FocalLength: 50 - m_NormalizedViewPortRect: - serializedVersion: 2 - x: 0 - y: 0 - width: 1 - height: 1 - near clip plane: 0.3 - far clip plane: 1000 - field of view: 60 - orthographic: 0 - orthographic size: 5 - m_Depth: 0 - m_CullingMask: - serializedVersion: 2 - m_Bits: 4294967295 - m_RenderingPath: -1 - m_TargetTexture: {fileID: 0} - m_TargetDisplay: 0 - m_TargetEye: 3 - m_HDR: 1 - m_AllowMSAA: 1 - m_AllowDynamicResolution: 0 - m_ForceIntoRT: 0 - m_OcclusionCulling: 1 - m_StereoConvergence: 10 - m_StereoSeparation: 0.022 --- !u!1 &2106568774277185397 GameObject: m_ObjectHideFlags: 0 @@ -1141,6 +1067,80 @@ Transform: m_Father: {fileID: 493651747298573721} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &4268789250539021916 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8481296950853138536} + - component: {fileID: 4833884070633388363} + m_Layer: 0 + m_Name: Camera + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &8481296950853138536 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4268789250539021916} + m_LocalRotation: {x: 0.6532815, y: 0.6532815, z: 0.27059802, w: 0.27059802} + m_LocalPosition: {x: -25.040009, y: 0, z: 18.180008} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 7741631901276769502} + m_RootOrder: 5 + m_LocalEulerAnglesHint: {x: 135, y: 0, z: 0} +--- !u!20 &4833884070633388363 +Camera: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4268789250539021916} + m_Enabled: 1 + serializedVersion: 2 + m_ClearFlags: 1 + m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0} + m_projectionMatrixMode: 1 + m_GateFitMode: 2 + m_FOVAxisMode: 0 + m_SensorSize: {x: 36, y: 24} + m_LensShift: {x: 0, y: 0} + m_FocalLength: 50 + m_NormalizedViewPortRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 + near clip plane: 0.3 + far clip plane: 1000 + field of view: 60 + orthographic: 0 + orthographic size: 5 + m_Depth: 0 + m_CullingMask: + serializedVersion: 2 + m_Bits: 4294967295 + m_RenderingPath: -1 + m_TargetTexture: {fileID: 0} + m_TargetDisplay: 0 + m_TargetEye: 3 + m_HDR: 1 + m_AllowMSAA: 1 + m_AllowDynamicResolution: 0 + m_ForceIntoRT: 0 + m_OcclusionCulling: 1 + m_StereoConvergence: 10 + m_StereoSeparation: 0.022 --- !u!1 &4358896822923908750 GameObject: m_ObjectHideFlags: 0 @@ -1917,8 +1917,8 @@ Transform: - {fileID: 332859260785970933} - {fileID: 9214335354106651463} - {fileID: 3148968837113393107} - - {fileID: 4406595736713743741} - {fileID: 893973250421703285} + - {fileID: 8481296950853138536} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: -90.00001, y: 0, z: 270} @@ -2020,7 +2020,7 @@ MonoBehaviour: LeftUp1: {fileID: 0} LeftUp2: {fileID: 0} LeftUp3: {fileID: 0} - camera: {fileID: 4125975049468457189} + camera: {fileID: 4833884070633388363} --- !u!1 &7336854124319573647 GameObject: m_ObjectHideFlags: 0 @@ -2380,7 +2380,7 @@ Transform: - {fileID: 7708474562554085326} - {fileID: 2716839668741559605} m_Father: {fileID: 7741631901276769502} - m_RootOrder: 5 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &8079254704376450756 GameObject: diff --git a/Assets/Changjing/Prefabs/T3-2/T32Right.prefab b/Assets/Changjing/Prefabs/T3-2/T32Right.prefab index 2cbf49e..583f013 100644 --- a/Assets/Changjing/Prefabs/T3-2/T32Right.prefab +++ b/Assets/Changjing/Prefabs/T3-2/T32Right.prefab @@ -68,80 +68,6 @@ Transform: m_Father: {fileID: 3589053393085742691} m_RootOrder: 12 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &177851526906199808 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 306510083891111738} - - component: {fileID: 2518910771958135393} - m_Layer: 0 - m_Name: Camera - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &306510083891111738 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 177851526906199808} - m_LocalRotation: {x: 0.6865373, y: 0.6865373, z: 0.1693119, w: 0.1693119} - m_LocalPosition: {x: -18.3, y: -0.7, z: 28.7} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 7741631901276769502} - m_RootOrder: 4 - m_LocalEulerAnglesHint: {x: 180, y: -27.70697, z: -90} ---- !u!20 &2518910771958135393 -Camera: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 177851526906199808} - m_Enabled: 1 - serializedVersion: 2 - m_ClearFlags: 1 - m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0} - m_projectionMatrixMode: 1 - m_GateFitMode: 2 - m_FOVAxisMode: 0 - m_SensorSize: {x: 36, y: 24} - m_LensShift: {x: 0, y: 0} - m_FocalLength: 50 - m_NormalizedViewPortRect: - serializedVersion: 2 - x: 0 - y: 0 - width: 1 - height: 1 - near clip plane: 0.3 - far clip plane: 1000 - field of view: 60 - orthographic: 0 - orthographic size: 5 - m_Depth: 0 - m_CullingMask: - serializedVersion: 2 - m_Bits: 4294967295 - m_RenderingPath: -1 - m_TargetTexture: {fileID: 0} - m_TargetDisplay: 0 - m_TargetEye: 3 - m_HDR: 1 - m_AllowMSAA: 1 - m_AllowDynamicResolution: 0 - m_ForceIntoRT: 0 - m_OcclusionCulling: 1 - m_StereoConvergence: 10 - m_StereoSeparation: 0.022 --- !u!1 &285886528982880713 GameObject: m_ObjectHideFlags: 0 @@ -1875,7 +1801,7 @@ Transform: - {fileID: 2064421343642758716} - {fileID: 5982777742230795212} m_Father: {fileID: 7741631901276769502} - m_RootOrder: 5 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &6838098071111730240 GameObject: @@ -1909,6 +1835,80 @@ Transform: m_Father: {fileID: 3589053393085742691} m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &6855350655402282090 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4406493850217487686} + - component: {fileID: 2307016651003690717} + m_Layer: 0 + m_Name: Camera + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4406493850217487686 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6855350655402282090} + m_LocalRotation: {x: -0.6532815, y: 0.6532815, z: 0.27059802, w: -0.27059802} + m_LocalPosition: {x: 25.040009, y: 0, z: 18.180008} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 7741631901276769502} + m_RootOrder: 5 + m_LocalEulerAnglesHint: {x: 135, y: 0, z: 0} +--- !u!20 &2307016651003690717 +Camera: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6855350655402282090} + m_Enabled: 1 + serializedVersion: 2 + m_ClearFlags: 1 + m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0} + m_projectionMatrixMode: 1 + m_GateFitMode: 2 + m_FOVAxisMode: 0 + m_SensorSize: {x: 36, y: 24} + m_LensShift: {x: 0, y: 0} + m_FocalLength: 50 + m_NormalizedViewPortRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 + near clip plane: 0.3 + far clip plane: 1000 + field of view: 60 + orthographic: 0 + orthographic size: 5 + m_Depth: 0 + m_CullingMask: + serializedVersion: 2 + m_Bits: 4294967295 + m_RenderingPath: -1 + m_TargetTexture: {fileID: 0} + m_TargetDisplay: 0 + m_TargetEye: 3 + m_HDR: 1 + m_AllowMSAA: 1 + m_AllowDynamicResolution: 0 + m_ForceIntoRT: 0 + m_OcclusionCulling: 1 + m_StereoConvergence: 10 + m_StereoSeparation: 0.022 --- !u!1 &6927694691712325220 GameObject: m_ObjectHideFlags: 0 @@ -1943,8 +1943,8 @@ Transform: - {fileID: 5439825677865547725} - {fileID: 2557915033237587606} - {fileID: 8576711210156279719} - - {fileID: 306510083891111738} - {fileID: 3589053393085742691} + - {fileID: 4406493850217487686} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: -90.00001, y: 0, z: 90} @@ -2046,7 +2046,7 @@ MonoBehaviour: LeftUp1: {fileID: 5982777742230795212} LeftUp2: {fileID: 0} LeftUp3: {fileID: 0} - camera: {fileID: 2518910771958135393} + camera: {fileID: 2307016651003690717} --- !u!1 &7123232459235034494 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Changjing/Prefabs/Ten/shizilu_2.prefab b/Assets/Changjing/Prefabs/Ten/shizilu_2.prefab index ab2bf20..95dc068 100644 --- a/Assets/Changjing/Prefabs/Ten/shizilu_2.prefab +++ b/Assets/Changjing/Prefabs/Ten/shizilu_2.prefab @@ -958,6 +958,80 @@ Transform: m_Father: {fileID: 6926599048049521998} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &2439125982858662958 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8446467016016843736} + - component: {fileID: 2137504631554556060} + m_Layer: 0 + m_Name: Camera + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &8446467016016843736 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2439125982858662958} + m_LocalRotation: {x: -0.92387956, y: -0, z: -0, w: -0.3826834} + m_LocalPosition: {x: 0, y: 25.04001, z: 18.180016} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 2804172998402099574} + m_RootOrder: 5 + m_LocalEulerAnglesHint: {x: 135, y: 0, z: 0} +--- !u!20 &2137504631554556060 +Camera: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2439125982858662958} + m_Enabled: 1 + serializedVersion: 2 + m_ClearFlags: 1 + m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0} + m_projectionMatrixMode: 1 + m_GateFitMode: 2 + m_FOVAxisMode: 0 + m_SensorSize: {x: 36, y: 24} + m_LensShift: {x: 0, y: 0} + m_FocalLength: 50 + m_NormalizedViewPortRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 + near clip plane: 0.3 + far clip plane: 1000 + field of view: 60 + orthographic: 0 + orthographic size: 5 + m_Depth: 0 + m_CullingMask: + serializedVersion: 2 + m_Bits: 4294967295 + m_RenderingPath: -1 + m_TargetTexture: {fileID: 0} + m_TargetDisplay: 0 + m_TargetEye: 3 + m_HDR: 1 + m_AllowMSAA: 1 + m_AllowDynamicResolution: 0 + m_ForceIntoRT: 0 + m_OcclusionCulling: 1 + m_StereoConvergence: 10 + m_StereoSeparation: 0.022 --- !u!1 &2443589287598162828 GameObject: m_ObjectHideFlags: 0 @@ -1395,8 +1469,8 @@ Transform: - {fileID: 801382887228912229} - {fileID: 3273995590237864629} - {fileID: 3277399072273346961} - - {fileID: 3207336756189232527} - {fileID: 4882268584654794391} + - {fileID: 8446467016016843736} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -1498,7 +1572,7 @@ MonoBehaviour: LeftUp1: {fileID: 6926599048049521998} LeftUp2: {fileID: 1782588141285240584} LeftUp3: {fileID: 0} - camera: {fileID: 2316662900429030375} + camera: {fileID: 2137504631554556060} --- !u!1 &3489124964709522988 GameObject: m_ObjectHideFlags: 0 @@ -3589,80 +3663,6 @@ Transform: m_Father: {fileID: 8814555800084589681} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &7891112723378039802 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 3207336756189232527} - - component: {fileID: 2316662900429030375} - m_Layer: 0 - m_Name: Camera - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &3207336756189232527 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7891112723378039802} - m_LocalRotation: {x: -0, y: 0.92387956, z: 0.3826834, w: 0} - m_LocalPosition: {x: 0, y: -27, z: 16.62} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 2804172998402099574} - m_RootOrder: 4 - m_LocalEulerAnglesHint: {x: 135, y: 0, z: 0} ---- !u!20 &2316662900429030375 -Camera: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7891112723378039802} - m_Enabled: 1 - serializedVersion: 2 - m_ClearFlags: 1 - m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0} - m_projectionMatrixMode: 1 - m_GateFitMode: 2 - m_FOVAxisMode: 0 - m_SensorSize: {x: 36, y: 24} - m_LensShift: {x: 0, y: 0} - m_FocalLength: 50 - m_NormalizedViewPortRect: - serializedVersion: 2 - x: 0 - y: 0 - width: 1 - height: 1 - near clip plane: 0.3 - far clip plane: 1000 - field of view: 60 - orthographic: 0 - orthographic size: 5 - m_Depth: 0 - m_CullingMask: - serializedVersion: 2 - m_Bits: 4294967295 - m_RenderingPath: -1 - m_TargetTexture: {fileID: 0} - m_TargetDisplay: 0 - m_TargetEye: 3 - m_HDR: 1 - m_AllowMSAA: 1 - m_AllowDynamicResolution: 0 - m_ForceIntoRT: 0 - m_OcclusionCulling: 1 - m_StereoConvergence: 10 - m_StereoSeparation: 0.022 --- !u!1 &7944063341169178986 GameObject: m_ObjectHideFlags: 0 @@ -4045,7 +4045,7 @@ Transform: - {fileID: 8814555800084589681} - {fileID: 2703509273620312561} m_Father: {fileID: 2804172998402099574} - m_RootOrder: 5 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &8667379438300106182 GameObject: diff --git a/Assets/Changjing/Prefabs/Ten/shizilu_3.prefab b/Assets/Changjing/Prefabs/Ten/shizilu_3.prefab index bf771ec..2c69130 100644 --- a/Assets/Changjing/Prefabs/Ten/shizilu_3.prefab +++ b/Assets/Changjing/Prefabs/Ten/shizilu_3.prefab @@ -340,7 +340,7 @@ Transform: - {fileID: 6664344600662765939} - {fileID: 7555603231770726696} m_Father: {fileID: 3109782483930183191} - m_RootOrder: 5 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &472363752614811341 GameObject: @@ -1117,80 +1117,6 @@ Transform: m_Father: {fileID: 5411820931375550254} m_RootOrder: 17 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &1583085288982468816 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 5264294483708157798} - - component: {fileID: 5920075478076797701} - m_Layer: 0 - m_Name: Camera - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &5264294483708157798 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1583085288982468816} - m_LocalRotation: {x: -0, y: 0.92387956, z: 0.3826834, w: 0} - m_LocalPosition: {x: 0, y: -27, z: 16.62} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 3109782483930183191} - m_RootOrder: 4 - m_LocalEulerAnglesHint: {x: 135, y: 0, z: 0} ---- !u!20 &5920075478076797701 -Camera: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1583085288982468816} - m_Enabled: 1 - serializedVersion: 2 - m_ClearFlags: 1 - m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0} - m_projectionMatrixMode: 1 - m_GateFitMode: 2 - m_FOVAxisMode: 0 - m_SensorSize: {x: 36, y: 24} - m_LensShift: {x: 0, y: 0} - m_FocalLength: 50 - m_NormalizedViewPortRect: - serializedVersion: 2 - x: 0 - y: 0 - width: 1 - height: 1 - near clip plane: 0.3 - far clip plane: 1000 - field of view: 60 - orthographic: 0 - orthographic size: 5 - m_Depth: 0 - m_CullingMask: - serializedVersion: 2 - m_Bits: 4294967295 - m_RenderingPath: -1 - m_TargetTexture: {fileID: 0} - m_TargetDisplay: 0 - m_TargetEye: 3 - m_HDR: 1 - m_AllowMSAA: 1 - m_AllowDynamicResolution: 0 - m_ForceIntoRT: 0 - m_OcclusionCulling: 1 - m_StereoConvergence: 10 - m_StereoSeparation: 0.022 --- !u!1 &1593079687296540214 GameObject: m_ObjectHideFlags: 0 @@ -1881,8 +1807,8 @@ Transform: - {fileID: 1302571392261308986} - {fileID: 9052887623359106888} - {fileID: 5169463045836499760} - - {fileID: 5264294483708157798} - {fileID: 5411820931375550254} + - {fileID: 5246560087160506394} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -1984,7 +1910,7 @@ MonoBehaviour: LeftUp1: {fileID: 708982149626591498} LeftUp2: {fileID: 8332293692268952559} LeftUp3: {fileID: 2788217879698111327} - camera: {fileID: 5920075478076797701} + camera: {fileID: 8449160009370266441} --- !u!1 &2334497072662441063 GameObject: m_ObjectHideFlags: 0 @@ -6042,6 +5968,80 @@ Transform: m_Father: {fileID: 708982149626591498} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &8664997521507123378 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5246560087160506394} + - component: {fileID: 8449160009370266441} + m_Layer: 0 + m_Name: Camera (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &5246560087160506394 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8664997521507123378} + m_LocalRotation: {x: -0.92387956, y: -0, z: -0, w: -0.3826834} + m_LocalPosition: {x: 0, y: 25.04001, z: 18.180016} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 3109782483930183191} + m_RootOrder: 5 + m_LocalEulerAnglesHint: {x: 135, y: 0, z: 0} +--- !u!20 &8449160009370266441 +Camera: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8664997521507123378} + m_Enabled: 1 + serializedVersion: 2 + m_ClearFlags: 1 + m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0} + m_projectionMatrixMode: 1 + m_GateFitMode: 2 + m_FOVAxisMode: 0 + m_SensorSize: {x: 36, y: 24} + m_LensShift: {x: 0, y: 0} + m_FocalLength: 50 + m_NormalizedViewPortRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 + near clip plane: 0.3 + far clip plane: 1000 + field of view: 60 + orthographic: 0 + orthographic size: 5 + m_Depth: 0 + m_CullingMask: + serializedVersion: 2 + m_Bits: 4294967295 + m_RenderingPath: -1 + m_TargetTexture: {fileID: 0} + m_TargetDisplay: 0 + m_TargetEye: 3 + m_HDR: 1 + m_AllowMSAA: 1 + m_AllowDynamicResolution: 0 + m_ForceIntoRT: 0 + m_OcclusionCulling: 1 + m_StereoConvergence: 10 + m_StereoSeparation: 0.022 --- !u!1 &8681285670156745581 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scenes/MainScene.unity b/Assets/Scenes/MainScene.unity index d0e825f..43ff76f 100644 --- a/Assets/Scenes/MainScene.unity +++ b/Assets/Scenes/MainScene.unity @@ -393,7 +393,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} - m_AnchoredPosition: {x: 0, y: 160} + m_AnchoredPosition: {x: 0, y: 400} m_SizeDelta: {x: 250, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &28342272 @@ -463,14 +463,14 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 0.4, g: 0.78039217, b: 0.8039216, a: 1} m_RaycastTarget: 1 m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: e98bc064b43d23d40a87152b7c24a69c, type: 3} - m_Type: 0 + m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -677,6 +677,95 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 64549338} m_CullTransparentMesh: 0 +--- !u!1 &75643547 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 75643548} + - component: {fileID: 75643550} + - component: {fileID: 75643549} + - component: {fileID: 75643551} + m_Layer: 5 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &75643548 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 75643547} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 1758036310} + m_Father: {fileID: 230363334} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 85, y: 85} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &75643549 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 75643547} + 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: 0.5505073, g: 0.8051259, b: 0.8396226, a: 0.6509804} + m_RaycastTarget: 1 + 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!222 &75643550 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 75643547} + m_CullTransparentMesh: 0 +--- !u!114 &75643551 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 75643547} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a7f23c46ffb1bd241b472cf65717272c, type: 3} + m_Name: + m_EditorClassIdentifier: + point: {fileID: 1354089688} --- !u!1 &87514116 GameObject: m_ObjectHideFlags: 0 @@ -1485,7 +1574,7 @@ MonoBehaviour: - {fileID: 7784768134556555210, guid: f7edd1ca06cddcc4783ee10929c068e2, type: 3} carNumber: 30 createTime: {x: 2, y: 4} - speed: {x: 20, y: 40} + speed: {x: 20, y: 20} allCar: [] --- !u!4 &137901425 Transform: @@ -2609,11 +2698,11 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - - {fileID: 1758036310} - - {fileID: 886250565} - - {fileID: 775896657} - - {fileID: 941638803} - - {fileID: 1547712607} + - {fileID: 75643548} + - {fileID: 1832539259} + - {fileID: 1393436291} + - {fileID: 888721578} + - {fileID: 266026025} m_Father: {fileID: 1671534114} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -3013,7 +3102,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} - m_AnchoredPosition: {x: 0, y: 160} + m_AnchoredPosition: {x: 0, y: 400} m_SizeDelta: {x: 250, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &265557681 @@ -3083,14 +3172,14 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 0.4, g: 0.78039217, b: 0.8039216, a: 1} m_RaycastTarget: 1 m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: e98bc064b43d23d40a87152b7c24a69c, type: 3} - m_Type: 0 + m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -3107,6 +3196,95 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 265557679} m_CullTransparentMesh: 0 +--- !u!1 &266026024 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 266026025} + - component: {fileID: 266026027} + - component: {fileID: 266026026} + - component: {fileID: 266026028} + m_Layer: 5 + m_Name: Image (3) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &266026025 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 266026024} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 1547712607} + m_Father: {fileID: 230363334} + m_RootOrder: 4 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 85, y: 85} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &266026026 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 266026024} + 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: 0.5505073, g: 0.8051259, b: 0.8396226, a: 0.6509804} + m_RaycastTarget: 1 + 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!222 &266026027 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 266026024} + m_CullTransparentMesh: 0 +--- !u!114 &266026028 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 266026024} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a7f23c46ffb1bd241b472cf65717272c, type: 3} + m_Name: + m_EditorClassIdentifier: + point: {fileID: 594020353} --- !u!1 &271980403 GameObject: m_ObjectHideFlags: 0 @@ -3943,7 +4121,7 @@ MonoBehaviour: m_HandleRect: {fileID: 793444224} m_Direction: 0 m_Value: 0 - m_Size: 0.61307937 + m_Size: 0.6130143 m_NumberOfSteps: 0 m_OnValueChanged: m_PersistentCalls: @@ -5157,7 +5335,7 @@ 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: -315, y: 350} + m_AnchoredPosition: {x: -510, y: 350} m_SizeDelta: {x: 600, y: 400} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &404695536 @@ -6424,7 +6602,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 554113676} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 526.9, y: 0, z: 372} + m_LocalPosition: {x: 474.8, y: 0, z: 372} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} @@ -6465,7 +6643,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 0, y: 0.5} - m_AnchoredPosition: {x: 174, y: 304} + m_AnchoredPosition: {x: 962, y: -365} m_SizeDelta: {x: 350, y: 200} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &570816434 @@ -6757,7 +6935,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 7, y: 219} - m_SizeDelta: {x: 500, y: 300} + m_SizeDelta: {x: 500, y: 400} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &578987011 MonoBehaviour: @@ -6893,7 +7071,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 594020352} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -3.7, y: 0, z: -18.5} + m_LocalPosition: {x: 4, y: 0, z: -19} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 3695930166918355645} @@ -7658,7 +7836,7 @@ RectTransform: - {fileID: 576081745} - {fileID: 1793480706} m_Father: {fileID: 1671534114} - m_RootOrder: 15 + m_RootOrder: 14 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} @@ -8957,7 +9135,6 @@ GameObject: - component: {fileID: 775896657} - component: {fileID: 775896660} - component: {fileID: 775896659} - - component: {fileID: 775896658} m_Layer: 5 m_Name: "\u8B66\u5BDF\u5C40" m_TagString: Untagged @@ -8972,31 +9149,18 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 775896656} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 230363334} - m_RootOrder: 2 + m_Father: {fileID: 1393436291} + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 150, y: 150} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &775896658 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 775896656} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: a7f23c46ffb1bd241b472cf65717272c, type: 3} - m_Name: - m_EditorClassIdentifier: - point: {fileID: 2014360699} --- !u!114 &775896659 MonoBehaviour: m_ObjectHideFlags: 0 @@ -10098,7 +10262,7 @@ 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: -951.5, y: 141.49998} + m_AnchoredPosition: {x: -951.50006, y: 141.50002} m_SizeDelta: {x: 3104, y: 0} m_Pivot: {x: 0, y: 1} --- !u!114 &875169250 @@ -10280,7 +10444,6 @@ GameObject: - component: {fileID: 886250565} - component: {fileID: 886250568} - component: {fileID: 886250567} - - component: {fileID: 886250566} m_Layer: 5 m_Name: "\u533B\u9662" m_TagString: Untagged @@ -10295,31 +10458,18 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 886250564} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 230363334} - m_RootOrder: 1 + m_Father: {fileID: 1832539259} + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 150, y: 150} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &886250566 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 886250564} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: a7f23c46ffb1bd241b472cf65717272c, type: 3} - m_Name: - m_EditorClassIdentifier: - point: {fileID: 456200926} --- !u!114 &886250567 MonoBehaviour: m_ObjectHideFlags: 0 @@ -10396,6 +10546,95 @@ Transform: m_Father: {fileID: 1517784213} m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 180, z: 0} +--- !u!1 &888721577 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 888721578} + - component: {fileID: 888721580} + - component: {fileID: 888721579} + - component: {fileID: 888721581} + m_Layer: 5 + m_Name: Image (2) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &888721578 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 888721577} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 941638803} + m_Father: {fileID: 230363334} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 85, y: 85} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &888721579 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 888721577} + 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: 0.5505073, g: 0.8051259, b: 0.8396226, a: 0.6509804} + m_RaycastTarget: 1 + 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!222 &888721580 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 888721577} + m_CullTransparentMesh: 0 +--- !u!114 &888721581 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 888721577} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a7f23c46ffb1bd241b472cf65717272c, type: 3} + m_Name: + m_EditorClassIdentifier: + point: {fileID: 271980404} --- !u!1 &891715170 GameObject: m_ObjectHideFlags: 0 @@ -10860,7 +11099,6 @@ GameObject: - component: {fileID: 941638803} - component: {fileID: 941638806} - component: {fileID: 941638805} - - component: {fileID: 941638804} m_Layer: 5 m_Name: "\u5199\u5B57\u697C" m_TagString: Untagged @@ -10875,31 +11113,18 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 941638802} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 230363334} - m_RootOrder: 3 + m_Father: {fileID: 888721578} + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 150, y: 150} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &941638804 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 941638802} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: a7f23c46ffb1bd241b472cf65717272c, type: 3} - m_Name: - m_EditorClassIdentifier: - point: {fileID: 271980404} --- !u!114 &941638805 MonoBehaviour: m_ObjectHideFlags: 0 @@ -14891,7 +15116,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} - m_AnchoredPosition: {x: 0, y: 160} + m_AnchoredPosition: {x: 0, y: 400} m_SizeDelta: {x: 250, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1322957647 @@ -14961,14 +15186,14 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 0.4, g: 0.78039217, b: 0.8039216, a: 1} m_RaycastTarget: 1 m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: e98bc064b43d23d40a87152b7c24a69c, type: 3} - m_Type: 0 + m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -15586,6 +15811,95 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1378071674} m_CullTransparentMesh: 0 +--- !u!1 &1393436290 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1393436291} + - component: {fileID: 1393436293} + - component: {fileID: 1393436292} + - component: {fileID: 1393436294} + m_Layer: 5 + m_Name: Image (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1393436291 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1393436290} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 775896657} + m_Father: {fileID: 230363334} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 85, y: 85} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1393436292 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1393436290} + 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: 0.5505073, g: 0.8051259, b: 0.8396226, a: 0.6509804} + m_RaycastTarget: 1 + 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!222 &1393436293 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1393436290} + m_CullTransparentMesh: 0 +--- !u!114 &1393436294 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1393436290} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a7f23c46ffb1bd241b472cf65717272c, type: 3} + m_Name: + m_EditorClassIdentifier: + point: {fileID: 2014360699} --- !u!1 &1402043056 GameObject: m_ObjectHideFlags: 0 @@ -17209,7 +17523,6 @@ GameObject: - component: {fileID: 1547712607} - component: {fileID: 1547712610} - component: {fileID: 1547712609} - - component: {fileID: 1547712608} m_Layer: 5 m_Name: "\u5DE5\u5382" m_TagString: Untagged @@ -17224,31 +17537,18 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1547712606} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 230363334} - m_RootOrder: 4 + m_Father: {fileID: 266026025} + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 150, y: 150} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1547712608 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1547712606} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: a7f23c46ffb1bd241b472cf65717272c, type: 3} - m_Name: - m_EditorClassIdentifier: - point: {fileID: 594020353} --- !u!114 &1547712609 MonoBehaviour: m_ObjectHideFlags: 0 @@ -17275,7 +17575,7 @@ MonoBehaviour: m_BestFit: 0 m_MinSize: 10 m_MaxSize: 40 - m_Alignment: 4 + m_Alignment: 7 m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 0 @@ -17466,7 +17766,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &1568979000 RectTransform: m_ObjectHideFlags: 0 @@ -18181,7 +18481,7 @@ RectTransform: - {fileID: 1322957646} - {fileID: 1778857055} m_Father: {fileID: 1671534114} - m_RootOrder: 16 + m_RootOrder: 15 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -18574,12 +18874,12 @@ RectTransform: - {fileID: 1686403367} - {fileID: 750723646} - {fileID: 1415787196} - - {fileID: 1841901880} - {fileID: 1964243345} - {fileID: 2065607436} - {fileID: 663773612} - {fileID: 1637391349} - {fileID: 1674651245} + - {fileID: 1841901880} - {fileID: 313295614} m_Father: {fileID: 0} m_RootOrder: 3 @@ -18646,7 +18946,7 @@ RectTransform: - {fileID: 2142147982} - {fileID: 2026904480} m_Father: {fileID: 1671534114} - m_RootOrder: 17 + m_RootOrder: 16 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -18689,7 +18989,7 @@ 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: -787, y: 303} + m_AnchoredPosition: {x: -1, y: -368} m_SizeDelta: {x: 160, y: 80} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1686403368 @@ -18770,14 +19070,14 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 0.39716092, g: 0.7780794, b: 0.8018868, a: 1} m_RaycastTarget: 1 m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: fdd3632306f9ac949988a8f017be228b, type: 3} - m_Type: 0 + m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -19130,7 +19430,6 @@ GameObject: - component: {fileID: 1758036310} - component: {fileID: 1758036312} - component: {fileID: 1758036311} - - component: {fileID: 1758036313} m_Layer: 5 m_Name: "\u4F4F\u5B85\u533A" m_TagString: Untagged @@ -19145,17 +19444,17 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1758036309} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 230363334} + m_Father: {fileID: 75643548} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 150, y: 150} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1758036311 MonoBehaviour: @@ -19198,19 +19497,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1758036309} m_CullTransparentMesh: 0 ---- !u!114 &1758036313 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1758036309} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: a7f23c46ffb1bd241b472cf65717272c, type: 3} - m_Name: - m_EditorClassIdentifier: - point: {fileID: 1354089688} --- !u!1 &1770834829 GameObject: m_ObjectHideFlags: 0 @@ -19950,6 +20236,95 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1831064105} m_CullTransparentMesh: 0 +--- !u!1 &1832539258 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1832539259} + - component: {fileID: 1832539261} + - component: {fileID: 1832539260} + - component: {fileID: 1832539262} + m_Layer: 5 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1832539259 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1832539258} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 886250565} + m_Father: {fileID: 230363334} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 85, y: 85} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1832539260 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1832539258} + 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: 0.5505073, g: 0.8051259, b: 0.8396226, a: 0.6509804} + m_RaycastTarget: 1 + 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!222 &1832539261 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1832539258} + m_CullTransparentMesh: 0 +--- !u!114 &1832539262 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1832539258} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a7f23c46ffb1bd241b472cf65717272c, type: 3} + m_Name: + m_EditorClassIdentifier: + point: {fileID: 456200926} --- !u!1001 &1841901879 PrefabInstance: m_ObjectHideFlags: 0 @@ -20401,7 +20776,7 @@ PrefabInstance: - target: {fileID: 4487359194139227729, guid: fa32fb98d866fa144b3b41414d1f799b, type: 3} propertyPath: m_RootOrder - value: 12 + value: 17 objectReference: {fileID: 0} - target: {fileID: 4487359194139227729, guid: fa32fb98d866fa144b3b41414d1f799b, type: 3} @@ -20523,6 +20898,11 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 4 objectReference: {fileID: 0} + - target: {fileID: 5533274113474029349, guid: fa32fb98d866fa144b3b41414d1f799b, + type: 3} + propertyPath: m_MaxValue + value: 2 + objectReference: {fileID: 0} - target: {fileID: 5576117237989743379, guid: fa32fb98d866fa144b3b41414d1f799b, type: 3} propertyPath: m_AnchorMax.y @@ -21734,7 +22114,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1671534114} - m_RootOrder: 13 + m_RootOrder: 12 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -22787,7 +23167,7 @@ RectTransform: m_Children: - {fileID: 2132431871} m_Father: {fileID: 1671534114} - m_RootOrder: 14 + m_RootOrder: 13 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 0, y: 0.5} @@ -23083,7 +23463,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} - m_AnchoredPosition: {x: -621, y: 51} + m_AnchoredPosition: {x: -351.6, y: 51} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &2108577423 @@ -75691,7 +76071,7 @@ GameObject: - component: {fileID: 3695930166918355643} - component: {fileID: 3695930166918355642} m_Layer: 8 - m_Name: 1,3 + m_Name: "2\uFF0C4" m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -75705,7 +76085,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3695930166918355644} m_LocalRotation: {x: -0, y: 0.70710695, z: -0, w: -0.7071067} - m_LocalPosition: {x: 56.299927, y: 0.14099121, z: 172.89996} + m_LocalPosition: {x: 104.2, y: 0.14099121, z: 224.2} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 3695930167968037363} @@ -90542,7 +90922,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3695930167267611845} m_LocalRotation: {x: -0, y: 1, z: -0, w: 0} - m_LocalPosition: {x: 272.5, y: 0.1499939, z: 101.16} + m_LocalPosition: {x: 272.5, y: 0.1499939, z: 154.7} m_LocalScale: {x: 1.2394, y: 1, z: 1.2134} m_Children: - {fileID: 3695930168337716533} @@ -90604,7 +90984,7 @@ GameObject: - component: {fileID: 3695930167267611840} - component: {fileID: 3695930167267611843} m_Layer: 8 - m_Name: 5,2 + m_Name: 5,3 m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -104245,7 +104625,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3695930167627777499} m_LocalRotation: {x: -0, y: -0, z: -0, w: -1} - m_LocalPosition: {x: 374.49997, y: 0.15100098, z: 274.7} + m_LocalPosition: {x: 374.49997, y: 0.15100098, z: 326.7} m_LocalScale: {x: 1.58, y: 0.32, z: 1.58} m_Children: - {fileID: 3695930168100389677} @@ -104305,7 +104685,7 @@ GameObject: - component: {fileID: 3695930167627777510} - component: {fileID: 3695930167627777497} m_Layer: 8 - m_Name: 7,5 + m_Name: 7,6 m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -136473,7 +136853,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4579031855412283322} m_LocalRotation: {x: -0, y: 0.7071068, z: 0.7071068, w: 0} - m_LocalPosition: {x: 576.2, y: 7.81, z: 230.7} + m_LocalPosition: {x: 576.2, y: 7.8, z: 185.2} m_LocalScale: {x: 1.0841004, y: 1.0841002, z: 1.0841} m_Children: - {fileID: 788027160514921762} @@ -140321,7 +140701,7 @@ GameObject: m_Component: - component: {fileID: 3801088227897269504} m_Layer: 8 - m_Name: 11,4 + m_Name: 11,3 m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 diff --git a/ProjectSettings/QualitySettings.asset b/ProjectSettings/QualitySettings.asset index 7b7658d..181ef65 100644 --- a/ProjectSettings/QualitySettings.asset +++ b/ProjectSettings/QualitySettings.asset @@ -18,7 +18,7 @@ QualitySettings: shadowCascade2Split: 0.33333334 shadowCascade4Split: {x: 0.06666667, y: 0.2, z: 0.46666667} shadowmaskMode: 0 - blendWeights: 1 + skinWeights: 1 textureQuality: 1 anisotropicTextures: 0 antiAliasing: 0 @@ -40,6 +40,7 @@ QualitySettings: asyncUploadBufferSize: 16 asyncUploadPersistentBuffer: 1 resolutionScalingFixedDPIFactor: 1 + customRenderPipeline: {fileID: 0} excludedTargetPlatforms: [] - serializedVersion: 2 name: Low @@ -53,7 +54,7 @@ QualitySettings: shadowCascade2Split: 0.33333334 shadowCascade4Split: {x: 0.06666667, y: 0.2, z: 0.46666667} shadowmaskMode: 0 - blendWeights: 2 + skinWeights: 2 textureQuality: 0 anisotropicTextures: 0 antiAliasing: 0 @@ -75,6 +76,7 @@ QualitySettings: asyncUploadBufferSize: 16 asyncUploadPersistentBuffer: 1 resolutionScalingFixedDPIFactor: 1 + customRenderPipeline: {fileID: 0} excludedTargetPlatforms: [] - serializedVersion: 2 name: Medium @@ -88,7 +90,7 @@ QualitySettings: shadowCascade2Split: 0.33333334 shadowCascade4Split: {x: 0.06666667, y: 0.2, z: 0.46666667} shadowmaskMode: 0 - blendWeights: 2 + skinWeights: 2 textureQuality: 0 anisotropicTextures: 1 antiAliasing: 0 @@ -110,6 +112,7 @@ QualitySettings: asyncUploadBufferSize: 16 asyncUploadPersistentBuffer: 1 resolutionScalingFixedDPIFactor: 1 + customRenderPipeline: {fileID: 0} excludedTargetPlatforms: [] - serializedVersion: 2 name: High @@ -123,7 +126,7 @@ QualitySettings: shadowCascade2Split: 0.33333334 shadowCascade4Split: {x: 0.06666667, y: 0.2, z: 0.46666667} shadowmaskMode: 1 - blendWeights: 2 + skinWeights: 2 textureQuality: 0 anisotropicTextures: 1 antiAliasing: 0 @@ -145,6 +148,7 @@ QualitySettings: asyncUploadBufferSize: 16 asyncUploadPersistentBuffer: 1 resolutionScalingFixedDPIFactor: 1 + customRenderPipeline: {fileID: 0} excludedTargetPlatforms: [] - serializedVersion: 2 name: Very High @@ -158,7 +162,7 @@ QualitySettings: shadowCascade2Split: 0.33333334 shadowCascade4Split: {x: 0.06666667, y: 0.2, z: 0.46666667} shadowmaskMode: 1 - blendWeights: 4 + skinWeights: 4 textureQuality: 0 anisotropicTextures: 2 antiAliasing: 2 @@ -180,6 +184,7 @@ QualitySettings: asyncUploadBufferSize: 16 asyncUploadPersistentBuffer: 1 resolutionScalingFixedDPIFactor: 1 + customRenderPipeline: {fileID: 0} excludedTargetPlatforms: [] - serializedVersion: 2 name: Ultra @@ -193,10 +198,10 @@ QualitySettings: shadowCascade2Split: 0.33333334 shadowCascade4Split: {x: 0.06666667, y: 0.2, z: 0.46666667} shadowmaskMode: 1 - blendWeights: 4 + skinWeights: 4 textureQuality: 0 anisotropicTextures: 2 - antiAliasing: 2 + antiAliasing: 4 softParticles: 1 softVegetation: 1 realtimeReflectionProbes: 1 @@ -215,6 +220,7 @@ QualitySettings: asyncUploadBufferSize: 16 asyncUploadPersistentBuffer: 1 resolutionScalingFixedDPIFactor: 1 + customRenderPipeline: {fileID: 0} excludedTargetPlatforms: [] m_PerPlatformDefaultQuality: Android: 2 @@ -225,7 +231,7 @@ QualitySettings: PSP2: 2 Stadia: 5 Standalone: 5 - WebGL: 3 + WebGL: 5 Windows Store Apps: 5 XboxOne: 5 iPhone: 2 diff --git a/Unity.CollabProxy.Editor.csproj b/Unity.CollabProxy.Editor.csproj index 0a638e2..d0edfb7 100644 --- a/Unity.CollabProxy.Editor.csproj +++ b/Unity.CollabProxy.Editor.csproj @@ -652,12 +652,12 @@ D:/UnityHub/2019.4.17f1c1/Editor/Data/MonoBleedingEdge/lib/mono/unityscript/Boo.Lang.dll - - D:/UnityProject/Project/xf/Place/Library/ScriptAssemblies/UnityEditor.UI.dll - D:/UnityProject/Project/xf/Place/Library/ScriptAssemblies/UnityEngine.UI.dll + + D:/UnityProject/Project/xf/Place/Library/ScriptAssemblies/UnityEditor.UI.dll + diff --git a/Unity.Rider.Editor.csproj b/Unity.Rider.Editor.csproj index 6823321..382df7f 100644 --- a/Unity.Rider.Editor.csproj +++ b/Unity.Rider.Editor.csproj @@ -653,12 +653,12 @@ D:/UnityHub/2019.4.17f1c1/Editor/Data/MonoBleedingEdge/lib/mono/unityscript/Boo.Lang.dll - - D:/UnityProject/Project/xf/Place/Library/ScriptAssemblies/UnityEditor.UI.dll - D:/UnityProject/Project/xf/Place/Library/ScriptAssemblies/UnityEngine.UI.dll + + D:/UnityProject/Project/xf/Place/Library/ScriptAssemblies/UnityEditor.UI.dll + diff --git a/Unity.TextMeshPro.Editor.csproj b/Unity.TextMeshPro.Editor.csproj index d2e76d9..6d48a1a 100644 --- a/Unity.TextMeshPro.Editor.csproj +++ b/Unity.TextMeshPro.Editor.csproj @@ -679,12 +679,12 @@ D:/UnityHub/2019.4.17f1c1/Editor/Data/MonoBleedingEdge/lib/mono/unityscript/Boo.Lang.dll - - D:/UnityProject/Project/xf/Place/Library/ScriptAssemblies/UnityEditor.UI.dll - D:/UnityProject/Project/xf/Place/Library/ScriptAssemblies/UnityEngine.UI.dll + + D:/UnityProject/Project/xf/Place/Library/ScriptAssemblies/UnityEditor.UI.dll + diff --git a/Unity.TextMeshPro.csproj b/Unity.TextMeshPro.csproj index 585041e..4a2ddc0 100644 --- a/Unity.TextMeshPro.csproj +++ b/Unity.TextMeshPro.csproj @@ -673,12 +673,12 @@ D:/UnityHub/2019.4.17f1c1/Editor/Data/NetStandard/compat/2.0.0/shims/netfx/System.Xml.Serialization.dll - - D:/UnityProject/Project/xf/Place/Library/ScriptAssemblies/UnityEditor.UI.dll - D:/UnityProject/Project/xf/Place/Library/ScriptAssemblies/UnityEngine.UI.dll + + D:/UnityProject/Project/xf/Place/Library/ScriptAssemblies/UnityEditor.UI.dll + diff --git a/Unity.Timeline.Editor.csproj b/Unity.Timeline.Editor.csproj index 6060d13..5977ea6 100644 --- a/Unity.Timeline.Editor.csproj +++ b/Unity.Timeline.Editor.csproj @@ -868,12 +868,12 @@ D:/UnityHub/2019.4.17f1c1/Editor/Data/MonoBleedingEdge/lib/mono/unityscript/Boo.Lang.dll - - D:/UnityProject/Project/xf/Place/Library/ScriptAssemblies/UnityEditor.UI.dll - D:/UnityProject/Project/xf/Place/Library/ScriptAssemblies/UnityEngine.UI.dll + + D:/UnityProject/Project/xf/Place/Library/ScriptAssemblies/UnityEditor.UI.dll + diff --git a/Unity.Timeline.csproj b/Unity.Timeline.csproj index 828a71f..7fffb3e 100644 --- a/Unity.Timeline.csproj +++ b/Unity.Timeline.csproj @@ -684,12 +684,12 @@ D:/UnityHub/2019.4.17f1c1/Editor/Data/NetStandard/compat/2.0.0/shims/netfx/System.Xml.Serialization.dll - - D:/UnityProject/Project/xf/Place/Library/ScriptAssemblies/UnityEditor.UI.dll - D:/UnityProject/Project/xf/Place/Library/ScriptAssemblies/UnityEngine.UI.dll + + D:/UnityProject/Project/xf/Place/Library/ScriptAssemblies/UnityEditor.UI.dll + diff --git a/Unity.VSCode.Editor.csproj b/Unity.VSCode.Editor.csproj index e105511..fc9bf2c 100644 --- a/Unity.VSCode.Editor.csproj +++ b/Unity.VSCode.Editor.csproj @@ -639,12 +639,12 @@ D:/UnityHub/2019.4.17f1c1/Editor/Data/MonoBleedingEdge/lib/mono/unityscript/Boo.Lang.dll - - D:/UnityProject/Project/xf/Place/Library/ScriptAssemblies/UnityEditor.UI.dll - D:/UnityProject/Project/xf/Place/Library/ScriptAssemblies/UnityEngine.UI.dll + + D:/UnityProject/Project/xf/Place/Library/ScriptAssemblies/UnityEditor.UI.dll + diff --git a/obj/Debug/Assembly-CSharp.csproj.AssemblyReference.cache b/obj/Debug/Assembly-CSharp.csproj.AssemblyReference.cache index 561598b..a3a06c5 100644 Binary files a/obj/Debug/Assembly-CSharp.csproj.AssemblyReference.cache and b/obj/Debug/Assembly-CSharp.csproj.AssemblyReference.cache differ diff --git a/obj/Debug/Unity.CollabProxy.Editor.csproj.AssemblyReference.cache b/obj/Debug/Unity.CollabProxy.Editor.csproj.AssemblyReference.cache index 9135944..c1969bf 100644 Binary files a/obj/Debug/Unity.CollabProxy.Editor.csproj.AssemblyReference.cache and b/obj/Debug/Unity.CollabProxy.Editor.csproj.AssemblyReference.cache differ diff --git a/obj/Debug/Unity.TextMeshPro.Editor.csproj.AssemblyReference.cache b/obj/Debug/Unity.TextMeshPro.Editor.csproj.AssemblyReference.cache index a797cd6..f5e894a 100644 Binary files a/obj/Debug/Unity.TextMeshPro.Editor.csproj.AssemblyReference.cache and b/obj/Debug/Unity.TextMeshPro.Editor.csproj.AssemblyReference.cache differ diff --git a/obj/Debug/Unity.VSCode.Editor.csproj.AssemblyReference.cache b/obj/Debug/Unity.VSCode.Editor.csproj.AssemblyReference.cache index 7a15056..b591d74 100644 Binary files a/obj/Debug/Unity.VSCode.Editor.csproj.AssemblyReference.cache and b/obj/Debug/Unity.VSCode.Editor.csproj.AssemblyReference.cache differ