diff --git a/Assets/GameAssets/Renderer/Minimap.prefab b/Assets/GameAssets/Renderer/Minimap.prefab index 48e9c5b9..c69686e8 100644 --- a/Assets/GameAssets/Renderer/Minimap.prefab +++ b/Assets/GameAssets/Renderer/Minimap.prefab @@ -108,7 +108,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 400, y: 400} + m_SizeDelta: {x: 372, y: 372} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1586417954866262514 CanvasRenderer: @@ -394,6 +394,11 @@ PrefabInstance: propertyPath: m_Name value: "\u626B\u63CF\u533A\u57DF" objectReference: {fileID: 0} + - target: {fileID: 6612989792782812400, guid: 27b14bebf99279747a2a4c8e57fd66a7, + type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 27b14bebf99279747a2a4c8e57fd66a7, type: 3} --- !u!224 &8295591216700450604 stripped diff --git a/Assets/StreamingAssets/IPPort.txt b/Assets/StreamingAssets/IPPort.txt index a012cbee..d9f6429d 100644 --- a/Assets/StreamingAssets/IPPort.txt +++ b/Assets/StreamingAssets/IPPort.txt @@ -1 +1 @@ -192.168.138.15:48888 \ No newline at end of file +192.168.107.15:48888 \ No newline at end of file diff --git a/Assets/StreamingAssets/confing.txt b/Assets/StreamingAssets/confing.txt index 87589c67..8708cdba 100644 --- a/Assets/StreamingAssets/confing.txt +++ b/Assets/StreamingAssets/confing.txt @@ -1 +1 @@ -192.168.138.15 \ No newline at end of file +192.168.107.15 \ No newline at end of file diff --git a/Assets/Toolset.meta b/Assets/Toolset.meta deleted file mode 100644 index 34e31a78..00000000 --- a/Assets/Toolset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 4ff8c8ad0205d4a45bc3eed67b9d367c -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Toolset/XFrame.meta b/Assets/Toolset/XFrame.meta deleted file mode 100644 index ad4d9954..00000000 --- a/Assets/Toolset/XFrame.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 2fbfa65429b952f4a8635660e9985476 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Toolset/XFrame/Core.meta b/Assets/Toolset/XFrame/Core.meta deleted file mode 100644 index 1ef0eeaa..00000000 --- a/Assets/Toolset/XFrame/Core.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 681cc409b4e82184abf4cc59f3390b29 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Toolset/XFrame/Core/Fonts.meta b/Assets/Toolset/XFrame/Core/Fonts.meta deleted file mode 100644 index 16bb39e2..00000000 --- a/Assets/Toolset/XFrame/Core/Fonts.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 341e1e6005e7fc2468f38a5ef2bc4b99 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Toolset/XFrame/Core/Fonts/微软雅黑精简版.ttf b/Assets/Toolset/XFrame/Core/Fonts/微软雅黑精简版.ttf deleted file mode 100644 index 07d3d24e..00000000 Binary files a/Assets/Toolset/XFrame/Core/Fonts/微软雅黑精简版.ttf and /dev/null differ diff --git a/Assets/Toolset/XFrame/Core/Fonts/微软雅黑精简版.ttf.meta b/Assets/Toolset/XFrame/Core/Fonts/微软雅黑精简版.ttf.meta deleted file mode 100644 index 5ed5a1aa..00000000 --- a/Assets/Toolset/XFrame/Core/Fonts/微软雅黑精简版.ttf.meta +++ /dev/null @@ -1,22 +0,0 @@ -fileFormatVersion: 2 -guid: 32fdf0a09ad73fa4f9700faa8b012f2d -TrueTypeFontImporter: - externalObjects: {} - serializedVersion: 4 - fontSize: 16 - forceTextureCase: -2 - characterSpacing: 0 - characterPadding: 1 - includeFontData: 1 - fontName: Microsoft YaHei - fontNames: - - Microsoft YaHei - fallbackFontReferences: [] - customCharacters: - fontRenderingMode: 0 - ascentCalculationMode: 1 - useLegacyBoundsCalculation: 0 - shouldRoundAdvanceValue: 1 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Toolset/XFrame/Core/Fonts/思源黑体SourceHanSansCN-Medium.otf b/Assets/Toolset/XFrame/Core/Fonts/思源黑体SourceHanSansCN-Medium.otf deleted file mode 100644 index 53e03e03..00000000 Binary files a/Assets/Toolset/XFrame/Core/Fonts/思源黑体SourceHanSansCN-Medium.otf and /dev/null differ diff --git a/Assets/Toolset/XFrame/Core/Fonts/思源黑体SourceHanSansCN-Medium.otf.meta b/Assets/Toolset/XFrame/Core/Fonts/思源黑体SourceHanSansCN-Medium.otf.meta deleted file mode 100644 index 4816c34f..00000000 --- a/Assets/Toolset/XFrame/Core/Fonts/思源黑体SourceHanSansCN-Medium.otf.meta +++ /dev/null @@ -1,22 +0,0 @@ -fileFormatVersion: 2 -guid: 1e2648e3a95e7f3418f84b4f1a64c6ca -TrueTypeFontImporter: - externalObjects: {} - serializedVersion: 4 - fontSize: 16 - forceTextureCase: -2 - characterSpacing: 0 - characterPadding: 1 - includeFontData: 1 - fontName: Source Han Sans CN - fontNames: - - Source Han Sans CN - fallbackFontReferences: [] - customCharacters: - fontRenderingMode: 0 - ascentCalculationMode: 1 - useLegacyBoundsCalculation: 0 - shouldRoundAdvanceValue: 1 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Toolset/XFrame/Core/Fonts/造字工房映力黑规体.otf b/Assets/Toolset/XFrame/Core/Fonts/造字工房映力黑规体.otf deleted file mode 100644 index b958012a..00000000 Binary files a/Assets/Toolset/XFrame/Core/Fonts/造字工房映力黑规体.otf and /dev/null differ diff --git a/Assets/Toolset/XFrame/Core/Fonts/造字工房映力黑规体.otf.meta b/Assets/Toolset/XFrame/Core/Fonts/造字工房映力黑规体.otf.meta deleted file mode 100644 index 98311ec4..00000000 --- a/Assets/Toolset/XFrame/Core/Fonts/造字工房映力黑规体.otf.meta +++ /dev/null @@ -1,22 +0,0 @@ -fileFormatVersion: 2 -guid: da4f9608fdc20254fb802a981fd78164 -TrueTypeFontImporter: - externalObjects: {} - serializedVersion: 4 - fontSize: 16 - forceTextureCase: -2 - characterSpacing: 0 - characterPadding: 1 - includeFontData: 1 - fontName: MF LiHei (Noncommercial) - fontNames: - - MF LiHei (Noncommercial) - fallbackFontReferences: [] - customCharacters: - fontRenderingMode: 0 - ascentCalculationMode: 1 - useLegacyBoundsCalculation: 0 - shouldRoundAdvanceValue: 1 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Toolset/XFrame/Core/Localization.meta b/Assets/Toolset/XFrame/Core/Localization.meta deleted file mode 100644 index a14fd0c4..00000000 --- a/Assets/Toolset/XFrame/Core/Localization.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 28b20581ea88305469326426e760b73f -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Toolset/XFrame/Core/Localization/Localization.cs b/Assets/Toolset/XFrame/Core/Localization/Localization.cs deleted file mode 100644 index 4b22062b..00000000 --- a/Assets/Toolset/XFrame/Core/Localization/Localization.cs +++ /dev/null @@ -1,35 +0,0 @@ -/* - * @Author: XIBINBIN - * @Date: 2019-09-02 16:48:00 - * @Last Modified by: XIBINBIN - * @Last Modified time: 2019-09-02 16:48:00 - */ -namespace XFrame.Core.Localization -{ - using LitJson; - using UnityEngine; - public class Localization { - public const string CHINESE = "Localization/Chinese"; - public const string ENGLISH = "Localization/English"; - public const string zidingyi= "Localization/想定_0728上车下车"; - private string language; - private JsonData languageJson; - public string Language - { - get - { - return language; - } - set - { - language = value; - TextAsset asset = Resources.Load(language); - languageJson = JsonMapper.ToObject(asset.text); - } - } - public string GetValue(string id) - { - return languageJson[id].ToString(); - } - } -} diff --git a/Assets/Toolset/XFrame/Core/Localization/Localization.cs.meta b/Assets/Toolset/XFrame/Core/Localization/Localization.cs.meta deleted file mode 100644 index 280eebf1..00000000 --- a/Assets/Toolset/XFrame/Core/Localization/Localization.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: c96f14eb72098844e99e68a419a9d5de -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Toolset/XFrame/Core/Localization/LocalizationText.cs b/Assets/Toolset/XFrame/Core/Localization/LocalizationText.cs deleted file mode 100644 index 7822ccc3..00000000 --- a/Assets/Toolset/XFrame/Core/Localization/LocalizationText.cs +++ /dev/null @@ -1,35 +0,0 @@ -/* - * @Author: XIBINBIN - * @Date: 2019-09-02 16:48:00 - * @Last Modified by: XIBINBIN - * @Last Modified time: 2019-09-02 16:48:00 - */ -namespace XFrame.Core.Localization -{ - using UnityEngine; - using UnityEngine.UI; - using XFrame.Core.Utils; - [RequireComponent(typeof(Text))] - public class LocalizationText : MonoBehaviour - { - [SerializeField] - private string textID = ""; - public string TextID - { - get - { - return textID; - } - } - private Text label; - public void Start() - { - label = GetComponent(); - SetupTextID(textID); - } - public void SetupTextID(string textID) - { - label.text = Singleton.Instance.GetValue(textID); - } - } -} \ No newline at end of file diff --git a/Assets/Toolset/XFrame/Core/Localization/LocalizationText.cs.meta b/Assets/Toolset/XFrame/Core/Localization/LocalizationText.cs.meta deleted file mode 100644 index c385368b..00000000 --- a/Assets/Toolset/XFrame/Core/Localization/LocalizationText.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 1a6c90d4cc4119c48ae0933e121d6835 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Toolset/XFrame/Core/Panel.meta b/Assets/Toolset/XFrame/Core/Panel.meta deleted file mode 100644 index 03cd4fcb..00000000 --- a/Assets/Toolset/XFrame/Core/Panel.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: af16cc0f46fb9d745957962925fc1df5 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Toolset/XFrame/Core/Panel/MaskPanel.cs b/Assets/Toolset/XFrame/Core/Panel/MaskPanel.cs deleted file mode 100644 index b7268bed..00000000 --- a/Assets/Toolset/XFrame/Core/Panel/MaskPanel.cs +++ /dev/null @@ -1,25 +0,0 @@ -using UnityEngine; -namespace XFrame.Core.UI -{ - /// - /// 遮罩面板 - /// - public class MaskPanel : XUIPanel - { - public MaskPanel():base(UIType.Mask, UIMode.None, UICollider.None) - { - uiPath = "Prefab/MaskPanel"; - } - public override void Awake(GameObject go) - { - } - public override void Active() - { - base.Active(); - } - public override void Hide() - { - base.Hide(); - } - } -} diff --git a/Assets/Toolset/XFrame/Core/Panel/MaskPanel.cs.meta b/Assets/Toolset/XFrame/Core/Panel/MaskPanel.cs.meta deleted file mode 100644 index 94b47822..00000000 --- a/Assets/Toolset/XFrame/Core/Panel/MaskPanel.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: e97dbd29c8a36e0478a02ccdcdb18c3f -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Toolset/XFrame/Core/Panel/Utils.meta b/Assets/Toolset/XFrame/Core/Panel/Utils.meta deleted file mode 100644 index 780c6fdf..00000000 --- a/Assets/Toolset/XFrame/Core/Panel/Utils.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: be9bb6ee1d7ac6646a329199bc72d5bf -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Toolset/XFrame/Core/Panel/Utils/AutoAssign.cs b/Assets/Toolset/XFrame/Core/Panel/Utils/AutoAssign.cs deleted file mode 100644 index 4080875d..00000000 --- a/Assets/Toolset/XFrame/Core/Panel/Utils/AutoAssign.cs +++ /dev/null @@ -1,144 +0,0 @@ -using System.Collections.Generic; -using System.Linq; -using System.Reflection; -using UnityEngine; -using UnityEngine.UI; -using XFrame.Core.UI; -namespace XFrame.Core.Utils -{ - /// - /// 自动赋值,初始化UI对象,无需手动拖拽或transfrom.find - /// 注意,场景中的UI元素名字必须跟脚本中的变量名称保持一致!!!!!!!!! - /// - public class AutoAssign - { - private static GameObject canvas; - /// - /// 公共Canvas - /// - public static GameObject PublicCanvas - { - get - { - if (!canvas) - { - canvas = GameObject.Find("Canvas"); - if (!canvas) - canvas = new GameObject("Canvas"); - if (!canvas.GetComponent()) - canvas.AddComponent(); - } - return canvas; - } - set { canvas = value; } - } - /// - /// 初始化完成状态 - /// - protected static bool Inited = false; - /// - /// 初始化UI对象 - /// - public static void InitObject(XUIPanel panel, Transform parent) - { - InitFields