lishuo/powerfun-unity
1
1 Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改细节

Browse Source
This commit is contained in:
Caiyanpeng committed 2021-11-03 13:48:53 +08:00
1 parent e8a12452ca
commit baab5a9fb0
10 files changed
+1960 -842
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Assets/Resources/UI/Prefab/Common/Alert.prefab
+839 -420
View File
File diff suppressed because it is too large. Load diff
Assets/Resources/UI/Prefab/Common/Mobile/Alert.prefab
+741 -336
View File
File diff suppressed because it is too large. Load diff
Assets/Resources/UI/Prefab/Common/Mobile/Alert.prefab.meta
+1 -1
View File
@@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 8a5129824b4737f45ab129a8bce67197
guid: fe9875af207d2ac45955948dc19e67c2
PrefabImporter:
externalObjects: {}
userData:
Assets/Scenes/Test.unity
+262 -76
View File
@@ -121,86 +121,92 @@ NavMeshSettings:
debug:
m_Flags: 0
m_NavMeshData: {fileID: 0}
--- !u!1 &289982461
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
--- !u!21 &62871795
Material:
serializedVersion: 6
m_Component:
- component: {fileID: 289982462}
- component: {fileID: 289982464}
- component: {fileID: 289982463}
m_Layer: 5
m_Name: Text
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &289982462
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 289982461}
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: 1678571401}
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: 160, y: 30}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &289982463
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 289982461}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1}
m_RaycastTarget: 1
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_FontData:
m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
m_FontSize: 14
m_FontStyle: 0
m_BestFit: 0
m_MinSize: 10
m_MaxSize: 40
m_Alignment: 0
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 1
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: 'New Text\n
123'
--- !u!222 &289982464
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 289982461}
m_CullTransparentMesh: 0
m_Name: RoundedCornersTextureMaterial(Clone)
m_Shader: {fileID: 4800000, guid: 0bd2ec5d73751e34a814274a454bec41, type: 3}
m_ShaderKeywords:
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap: {}
disabledShaderPasses: []
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
- _BumpMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailAlbedoMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailMask:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailNormalMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _EmissionMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MainTex:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MetallicGlossMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _OcclusionMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _ParallaxMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Floats:
- _BumpScale: 1
- _ColorMask: 15
- _Cutoff: 0.5
- _DetailNormalMapScale: 1
- _DstBlend: 0
- _GlossMapScale: 1
- _Glossiness: 0.5
- _GlossyReflections: 1
- _Height: 50
- _Metallic: 0
- _Mode: 0
- _OcclusionStrength: 1
- _Parallax: 0.02
- _Radius: 15
- _SmoothnessTextureChannel: 0
- _SpecularHighlights: 1
- _SrcBlend: 1
- _Stencil: 0
- _StencilComp: 8
- _StencilOp: 0
- _StencilReadMask: 255
- _StencilWriteMask: 255
- _UVSec: 0
- _UseUIAlphaClip: 0
- _Width: 50
- _ZWrite: 1
m_Colors:
- _Color: {r: 1, g: 1, b: 1, a: 1}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
- _WidthHeightRadius: {r: 380, g: 171, b: 60, a: 0}
--- !u!1 &845512357
GameObject:
m_ObjectHideFlags: 0
@@ -553,7 +559,7 @@ RectTransform:
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 0, y: 0, z: 0}
m_Children:
- {fileID: 289982462}
- {fileID: 622109423815468901}
m_Father: {fileID: 0}
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -653,3 +659,183 @@ Transform:
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 48.593002, y: -4.8190002, z: -6.4140005}
--- !u!224 &622109423815468901 stripped
RectTransform:
m_CorrespondingSourceObject: {fileID: 2240254494634332952, guid: fe9875af207d2ac45955948dc19e67c2,
type: 3}
m_PrefabInstance: {fileID: 1708226203620963453}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &1708226203620963453
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 1678571401}
m_Modifications:
- target: {fileID: 873508238106680624, guid: fe9875af207d2ac45955948dc19e67c2,
type: 3}
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1259748399372117051, guid: fe9875af207d2ac45955948dc19e67c2,
type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1259748399372117051, guid: fe9875af207d2ac45955948dc19e67c2,
type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1259748399372117051, guid: fe9875af207d2ac45955948dc19e67c2,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1259748399372117051, guid: fe9875af207d2ac45955948dc19e67c2,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2240254494634332952, guid: fe9875af207d2ac45955948dc19e67c2,
type: 3}
propertyPath: m_Pivot.x
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 2240254494634332952, guid: fe9875af207d2ac45955948dc19e67c2,
type: 3}
propertyPath: m_Pivot.y
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 2240254494634332952, guid: fe9875af207d2ac45955948dc19e67c2,
type: 3}
propertyPath: m_RootOrder
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2240254494634332952, guid: fe9875af207d2ac45955948dc19e67c2,
type: 3}
propertyPath: m_AnchorMax.x
value: 1
objectReference: {fileID: 0}
- target: {fileID: 2240254494634332952, guid: fe9875af207d2ac45955948dc19e67c2,
type: 3}
propertyPath: m_AnchorMax.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 2240254494634332952, guid: fe9875af207d2ac45955948dc19e67c2,
type: 3}
propertyPath: m_AnchorMin.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2240254494634332952, guid: fe9875af207d2ac45955948dc19e67c2,
type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2240254494634332952, guid: fe9875af207d2ac45955948dc19e67c2,
type: 3}
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2240254494634332952, guid: fe9875af207d2ac45955948dc19e67c2,
type: 3}
propertyPath: m_SizeDelta.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2240254494634332952, guid: fe9875af207d2ac45955948dc19e67c2,
type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2240254494634332952, guid: fe9875af207d2ac45955948dc19e67c2,
type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2240254494634332952, guid: fe9875af207d2ac45955948dc19e67c2,
type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2240254494634332952, guid: fe9875af207d2ac45955948dc19e67c2,
type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 2240254494634332952, guid: fe9875af207d2ac45955948dc19e67c2,
type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2240254494634332952, guid: fe9875af207d2ac45955948dc19e67c2,
type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2240254494634332952, guid: fe9875af207d2ac45955948dc19e67c2,
type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2240254494634332952, guid: fe9875af207d2ac45955948dc19e67c2,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2240254494634332952, guid: fe9875af207d2ac45955948dc19e67c2,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2240254494634332952, guid: fe9875af207d2ac45955948dc19e67c2,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2240254494634332952, guid: fe9875af207d2ac45955948dc19e67c2,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2240254494634332952, guid: fe9875af207d2ac45955948dc19e67c2,
type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2240254494634332959, guid: fe9875af207d2ac45955948dc19e67c2,
type: 3}
propertyPath: m_Name
value: Alert
objectReference: {fileID: 0}
- target: {fileID: 3465732790028354762, guid: fe9875af207d2ac45955948dc19e67c2,
type: 3}
propertyPath: m_Material
value:
objectReference: {fileID: 62871795}
- target: {fileID: 4789954526714205192, guid: fe9875af207d2ac45955948dc19e67c2,
type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4789954526714205192, guid: fe9875af207d2ac45955948dc19e67c2,
type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4789954526714205192, guid: fe9875af207d2ac45955948dc19e67c2,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4789954526714205192, guid: fe9875af207d2ac45955948dc19e67c2,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6853778383493131523, guid: fe9875af207d2ac45955948dc19e67c2,
type: 3}
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: fe9875af207d2ac45955948dc19e67c2, type: 3}
Assets/Scripts/App.cs
+2 -2
View File
@@ -15,7 +15,7 @@ using System.Timers;
public static class App
{
public static string Host = "http://192.168.0.101:5085/";
public static string Host = "http://192.168.0.101:5084/";
public static string AppVersion = Application.version;
@@ -108,7 +108,7 @@ public static class App
//Host = "http://192.168.0.101:5087/";
//UdpAddress = new IPEndPoint(IPAddress.Parse("47.97.84.8"), 21000);
//TcpAddress = new IPEndPoint(IPAddress.Parse("47.97.84.8"), 21001);
Host = "https://wx.powerfun.com.cn/";
Host = "http://192.168.0.101:5085/";
UdpAddress = new IPEndPoint(IPAddress.Parse("47.97.84.8"), 11000);
TcpAddress = new IPEndPoint(IPAddress.Parse("47.97.84.8"), 11001);
Assets/Scripts/Scenes/LoginController.cs
+1 -1
View File
@@ -131,7 +131,7 @@ public class LoginController : BaseScene
UIManager.SetModalPanel(transform.Find("ModalPanel").GetComponent<PFUIPanel>());
if (!string.IsNullOrEmpty(App.is401))
{
Utils.showToast(null, App.is401);
UIManager.ShowAlert("WARNING", "Your account has been logged in on other devices. If you did not do it yourself, please change your password in time.");
}
Init();
if (loginScrollView != null)
Assets/Scripts/UI/Prefab/AlertV1.cs
+97
View File
@@ -0,0 +1,97 @@
using UnityEngine;
using UnityEngine.UI;
using DG.Tweening;
using Assets.Scripts.UI.Control;
using System;
using UnityEngine.EventSystems;
using UnityEngine.Events;
public class AlertV1 : PFUIPanel
{
private PFUIText _title;
private PFUIText _content;
private PfUIButton _ok;
private PfUIButton _cancel;
protected override void Awake()
{
//var rect = this.gameObject.AddComponent<RectTransform>();
//var layout = this.gameObject.AddComponent<VerticalLayoutGroup>();
//layout.spacing = 20f;
//layout.childAlignment = TextAnchor.MiddleCenter;
var wrap = this.transform.Find("GameObject");
_title = wrap.Find("Title").GetComponent<PFUIText>();
_content = wrap.Find("Content").GetComponent<PFUIText>();
//text.transform.SetParent(layout.transform);
//text.text = "阿斯达克法拉盛地方";
///text = layout.transform.GetChild(0).gameObject.AddComponent<Text>();
//text = GetComponentInChildren<Transform>().gameObject.AddComponent<Text>();
_ok = wrap.Find("Ok").GetComponent<PfUIButton>();
_cancel = wrap.Find("Cancel").GetComponent<PfUIButton>();
//button.onClick.AddListener(() =>
//{
// this.Close();
// //this.Destroy(true);
// //DestroyImmediate(this);
//});
UIManager.AddEvent(_ok.gameObject, EventTriggerType.PointerClick, (e) =>
{
this.Close();
});
UIManager.AddEvent(_cancel.gameObject, EventTriggerType.PointerClick, (e) =>
{
this.Close();
});
}
// Start is called before the first frame update
protected override void Start()
{
}
public void Set(string title, string content)
{
//if(text == null)
//{
// return;
//}
//text.text = txt;
_title.Text = title;
_content.Text = content;
}
// Update is called once per frame
void Update()
{
}
public override void Show()
{
var panel = this.transform.Find("Panel");
var bg = panel.GetComponent<Image>();
//bg.alphaHitTestMinimumThreshold
var color = bg.color;
color.a = 0.6f;
bg.color = color;
base.Show();
}
public override void Close()
{
var panel = this.transform.Find("Panel");
var bg = panel.GetComponent<Image>();
bg.DOFade(0, 0.2f).OnComplete(() =>
{
this.gameObject.SetActive(false);
});
}
}
Assets/Scripts/UI/Prefab/AlertV1.cs.meta
+11
View File
@@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: faa1e2e3946e08546b5b6a80dd5b01d0
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:
Assets/Scripts/UI/Prefab/MapList/MapItem.cs
+1 -1
View File
@@ -223,7 +223,7 @@ public class MapItem : MonoBehaviour, IPointerExitHandler, IPointerEnterHandler,
}
else
{
UIManager.ShowAlert(r.errMsg);
UIManager.ShowAlert("WARNING", r.errMsg);
}
}
NearRouteModel model { get; set; }
Assets/Scripts/UIManager.cs
+5 -5
View File
@@ -917,8 +917,8 @@ public class UIManager : MonoBehaviour
}
}
Alert alert = null;
public static void ShowAlert(string msg)
AlertV1 alert = null;
public static void ShowAlert(string title,string msg)
{
if (UIManager.Instance == null)
{
@@ -927,14 +927,14 @@ public class UIManager : MonoBehaviour
if (UIManager.Instance.alert == null)
{
UIManager.Instance.alert = UIManager.Instance.GetInstance<Alert>("Alert", ref UIManager.Instance.alert);
UIManager.Instance.alert.SetText(msg);
UIManager.Instance.alert = UIManager.Instance.GetInstance<AlertV1>("Alert", ref UIManager.Instance.alert);
UIManager.Instance.alert.Set(title,msg);
UIManager.Show(UIManager.Instance.alert, null, true);
}
else
{
UIManager.Instance.alert.Show();
UIManager.Instance.alert.SetText(msg);
UIManager.Instance.alert.Set(title, msg);
}
}