Merge remote-tracking branch 'origin/dev' into dev_lishuo

This commit is contained in:
lishuo 2021-04-27 20:28:24 +08:00
commit b71a15e2ba
47 changed files with 10164 additions and 2757 deletions

2
.gitignore vendored
View File

@ -74,3 +74,5 @@ Assets/Packages.meta
Assets/Shader2D-master
Assets/ZFBrowser
Assets/Resources/UI/Font/*.ttf
Assets/WorldPoliticalMapGlobeEdition
Assets/WorldPoliticalMapGlobeEdition.meta

View File

@ -1,19 +0,0 @@
using Assets.Scripts.Apis;
using Assets.Scripts.Apis.Models;
using Newtonsoft.Json.Linq;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace Assets.Cyp.Common
{
public static class Global
{
public static UserResultModel CurrentUser { get; set; }
public static UserApi userApi = new UserApi();
public static MapApi mapApi = new MapApi();
public static MapInterruptRecordApi mapInterruptRecordApi = new MapInterruptRecordApi();
}
}

View File

@ -1,11 +0,0 @@
fileFormatVersion: 2
guid: f084ba73ccb087147bbf5c9d7201a06e
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -1,60 +0,0 @@
using Newtonsoft.Json;
using System;
using System.Collections;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using UnityEngine;
using UnityEngine.Networking;
using UnityEngine.UI;
namespace Assets.Cyp.Common
{
public static class Utils
{
/*显示简略提示需要拖Toast的预制件且保证其他组件名字不是Toast,ToastContainer*/
public static void showToast(GameObject game,string text,int duration = 1)
{
var toast = Utils.FindUpParent(game.transform).Find("ToastContainer");
if (toast!=null)
{
toast.GetComponent<Toast>().showToast(JsonConvert.SerializeObject(new
{
text,
duration
}));
//toast.SendMessage("showToast", );
}
}
/*显示简略提示需要拖Toast的预制件且保证其他组件名字不是Toast,ToastContainer*/
/*显示网络图片*/
public delegate Coroutine StartCoroutine(IEnumerator routine);
public static void DisplayImage(StartCoroutine startCoroutine,RawImage img, string url)
{
startCoroutine(DownloadImage(img, url));
}
static IEnumerator DownloadImage(RawImage img,string MediaUrl)
{
UnityWebRequest request = UnityWebRequestTexture.GetTexture(MediaUrl);
yield return request.SendWebRequest();
if (request.isNetworkError || request.isHttpError)
Debug.Log(request.error);
else
img.texture = ((DownloadHandlerTexture)request.downloadHandler).texture;
}
/*显示网络图片*/
/*获取最顶层对象*/
public static Transform FindUpParent(Transform zi)
{
if (zi.parent == null)
return zi;
else
return FindUpParent(zi.parent);
}
/*获取最顶层对象*/
}
}

View File

@ -1,11 +0,0 @@
fileFormatVersion: 2
guid: 5b26057ccd9f0954f8ffbddd5c7ca8a8
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -1,24 +0,0 @@
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
using UnityEngine.SceneManagement;
using UnityEngine.UI;
public class DemoScript : MonoBehaviour
{
[SerializeField] Button button;
// Start is called before the first frame update
void Start()
{
button.onClick.AddListener(()=>
{
SceneManager.UnloadSceneAsync("4-Demo");
});
}
// Update is called once per frame
void Update()
{
}
}

View File

@ -1,11 +0,0 @@
fileFormatVersion: 2
guid: 232bc1a830e1f7344887323f3b110026
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -1,30 +0,0 @@
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
using UnityEngine.UI;
public class ImageRotate : MonoBehaviour
{
float rotation = 360;
// Use this for initialization
void Start()
{
//Debug.Log ("Material used: "+animMat.name);
}
void Update()
{
Debug.Log(Time.deltaTime);
transform.Rotate(Vector3.back);
//if (Time.frameCount % 1 == 0)
//{
// float i = new System.Random().NextDouble() < .5 ? -0.5f : 2f;
// transform.rotation = Quaternion.Euler(0, 0, rotation += (float)(i * new System.Random().NextDouble()));
// if (rotation < 0)
// {
// rotation = 360;
// }
//}
}
}

View File

@ -1,68 +0,0 @@
using Assets.Cyp.Common;
using Newtonsoft.Json.Linq;
using System;
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
using UnityEngine.Networking;
using UnityEngine.SceneManagement;
using UnityEngine.UI;
public class Main : MonoBehaviour
{
[SerializeField] Text NickName;
[SerializeField] Text TotalKM;
[SerializeField] RawImage Avatar;
[SerializeField] GameObject BtnRide;
// Start is called before the first frame update
void Start()
{
if (Global.CurrentUser != null)
{
SetCurrentUser();
}
GetSummary();
if (BtnRide != null)
{
BtnRide.GetComponent<Button>().onClick.AddListener(GoRide);
}
}
void GoRide()
{
SceneManager.LoadScene("3-MapList");
Utils.showToast(gameObject,"去骑行");
}
void SetCurrentUser()
{
var user = Global.CurrentUser;
NickName.text = user.Nickname;
Utils.DisplayImage(StartCoroutine, Avatar, user.WxHeadImg);
}
void GetSummary()
{
var res = Global.userApi.GetSummary();
if (res.result)
{
TotalKM.text = $"{res.data.TotalDistance.ToString("#0.00")}KM";
}
else
{
Utils.showToast(gameObject, res.errMsg);
}
//var res = await NoAuthApi.GetCurrentUser();
//if (res.result)
//{
// Global.CurrentUser = res.data;
// SetCurrentUser();
//}
//else
//{
// Utils.showToast(gameObject, res.errMsg);
//}
}
// Update is called once per frame
void Update()
{
}
}

View File

@ -1,11 +0,0 @@
fileFormatVersion: 2
guid: f568140fc83dae647a243568c6c096b9
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.4 KiB

View File

@ -0,0 +1,116 @@
fileFormatVersion: 2
guid: 96bc99033bf6d1d49b8252599543005d
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: 17, y: 17, z: 17, w: 17}
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: Android
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:

View File

@ -14,7 +14,6 @@ GameObject:
- component: {fileID: 3475867170677891149}
- component: {fileID: 1006258579742512774}
- component: {fileID: 8304386005369837238}
- component: {fileID: 5144527249442959283}
m_Layer: 5
m_Name: Tooltips
m_TagString: Untagged
@ -69,8 +68,8 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 0}
m_Type: 0
m_Sprite: {fileID: 21300000, guid: 96bc99033bf6d1d49b8252599543005d, type: 3}
m_Type: 1
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
@ -130,19 +129,6 @@ MonoBehaviour:
m_ChildControlHeight: 0
m_ChildScaleWidth: 0
m_ChildScaleHeight: 0
--- !u!114 &5144527249442959283
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3113082501854063731}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: adb30198aa32dd140b5750692dd48104, type: 3}
m_Name:
m_EditorClassIdentifier:
radius: 17
--- !u!1 &3150550772099312289
GameObject:
m_ObjectHideFlags: 0

View File

@ -0,0 +1,844 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1 &628269285932116249
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 3375573268376707168}
- component: {fileID: 7696400418172266878}
- component: {fileID: 4897197053936486456}
- component: {fileID: 5064155270663215810}
m_Layer: 0
m_Name: Hot
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &3375573268376707168
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 628269285932116249}
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: 8514581898389219816}
m_Father: {fileID: 1644731075966996399}
m_RootOrder: 5
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 182, y: -33}
m_SizeDelta: {x: 46, y: 17}
m_Pivot: {x: 0, y: 1}
--- !u!222 &7696400418172266878
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 628269285932116249}
m_CullTransparentMesh: 0
--- !u!114 &4897197053936486456
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 628269285932116249}
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: 1, g: 1, b: 1, a: 1}
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!114 &5064155270663215810
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 628269285932116249}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 7245fe6cb36dc7b4e921e9ae44200f43, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Direction: 0
m_Color1: {r: 1, g: 0.45490196, b: 0.52156866, a: 1}
m_Color2: {r: 0.9764706, g: 0.1882353, b: 0.5254902, a: 1}
m_Color3: {r: 1, g: 1, b: 1, a: 1}
m_Color4: {r: 1, g: 1, b: 1, a: 1}
m_Rotation: 0
m_Offset1: 0
m_Offset2: 0
m_GradientStyle: 0
m_ColorSpace: -1
m_IgnoreAspectRatio: 1
--- !u!1 &1006707989137105944
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 7546774928026946670}
- component: {fileID: 5310671687985071753}
- component: {fileID: 7900034461715759898}
m_Layer: 5
m_Name: DistanceIcon
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &7546774928026946670
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1006707989137105944}
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: 1644731075966996399}
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 12, y: -36}
m_SizeDelta: {x: 12, y: 12}
m_Pivot: {x: 0, y: 1}
--- !u!222 &5310671687985071753
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1006707989137105944}
m_CullTransparentMesh: 0
--- !u!114 &7900034461715759898
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1006707989137105944}
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.36078432, g: 0.36078432, b: 0.43137255, a: 1}
m_RaycastTarget: 1
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: 8adf51874688e8b48a396a83ccc7ad9d, type: 3}
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!1 &1644731075966996398
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1644731075966996399}
- component: {fileID: 1644731075966996397}
- component: {fileID: 1644731075966996396}
- component: {fileID: 635729542}
- component: {fileID: 6808676794041105006}
m_Layer: 5
m_Name: Item
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &1644731075966996399
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1644731075966996398}
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: 8586563145068443211}
- {fileID: 7789815627924313506}
- {fileID: 592474734359368031}
- {fileID: 7546774928026946670}
- {fileID: 2525110298282261934}
- {fileID: 3375573268376707168}
m_Father: {fileID: 0}
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: 240, y: 60}
m_Pivot: {x: 0, y: 1}
--- !u!222 &1644731075966996397
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1644731075966996398}
m_CullTransparentMesh: 0
--- !u!114 &1644731075966996396
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1644731075966996398}
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.20784314, g: 0.20784314, b: 0.2627451, a: 1}
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!114 &635729542
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1644731075966996398}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 4798070a21cb55b40a0a89ac2b84f135, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!114 &6808676794041105006
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1644731075966996398}
m_Enabled: 0
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 7245fe6cb36dc7b4e921e9ae44200f43, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Direction: 2
m_Color1: {r: 1, g: 0.45490196, b: 0.52156866, a: 1}
m_Color2: {r: 0.9764706, g: 0.1882353, b: 0.5254902, a: 1}
m_Color3: {r: 1, g: 1, b: 1, a: 1}
m_Color4: {r: 1, g: 1, b: 1, a: 1}
m_Rotation: -57
m_Offset1: 0
m_Offset2: 0
m_GradientStyle: 0
m_ColorSpace: -1
m_IgnoreAspectRatio: 1
--- !u!1 &2605937531982105974
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 7789815627924313506}
- component: {fileID: 7879955616901665858}
- component: {fileID: 289854409129544235}
m_Layer: 5
m_Name: km
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &7789815627924313506
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2605937531982105974}
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: 1644731075966996399}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 28, y: -33}
m_SizeDelta: {x: 60, y: 17}
m_Pivot: {x: 0, y: 1}
--- !u!222 &7879955616901665858
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2605937531982105974}
m_CullTransparentMesh: 0
--- !u!114 &289854409129544235
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2605937531982105974}
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.36078432, g: 0.36078432, b: 0.43137255, a: 1}
m_RaycastTarget: 1
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_FontData:
m_Font: {fileID: 12800000, guid: 1db9e217733971041be26b076fda6083, type: 3}
m_FontSize: 12
m_FontStyle: 0
m_BestFit: 0
m_MinSize: 1
m_MaxSize: 40
m_Alignment: 3
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: 36.8KM
--- !u!1 &5516118230379645951
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 592474734359368031}
- component: {fileID: 1893774285036630824}
- component: {fileID: 8589021350335056505}
m_Layer: 5
m_Name: count
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &592474734359368031
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5516118230379645951}
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: 1644731075966996399}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 108, y: -33}
m_SizeDelta: {x: 60, y: 17}
m_Pivot: {x: 0, y: 1}
--- !u!222 &1893774285036630824
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5516118230379645951}
m_CullTransparentMesh: 0
--- !u!114 &8589021350335056505
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5516118230379645951}
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.9764706, g: 0.1882353, b: 0.5254902, a: 1}
m_RaycastTarget: 1
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_FontData:
m_Font: {fileID: 12800000, guid: 1db9e217733971041be26b076fda6083, type: 3}
m_FontSize: 12
m_FontStyle: 0
m_BestFit: 0
m_MinSize: 1
m_MaxSize: 40
m_Alignment: 6
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: 0000
--- !u!1 &8489791541032269154
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 2525110298282261934}
- component: {fileID: 8071121334430382672}
- component: {fileID: 4161665701330225276}
m_Layer: 5
m_Name: BikeIcon
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &2525110298282261934
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8489791541032269154}
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: 1644731075966996399}
m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 92, y: -36}
m_SizeDelta: {x: 12, y: 12}
m_Pivot: {x: 0, y: 1}
--- !u!222 &8071121334430382672
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8489791541032269154}
m_CullTransparentMesh: 0
--- !u!114 &4161665701330225276
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8489791541032269154}
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.9764706, g: 0.1882353, b: 0.5254902, a: 1}
m_RaycastTarget: 1
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: b7a1a41339f505044907a87fb80c4c88, type: 3}
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!1001 &7650792506464872912
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 3375573268376707168}
m_Modifications:
- target: {fileID: 2018962972499165240, guid: d1deda2310a3a7241a8e0d559585b30d,
type: 3}
propertyPath: m_Pivot.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2018962972499165240, guid: d1deda2310a3a7241a8e0d559585b30d,
type: 3}
propertyPath: m_Pivot.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 2018962972499165240, guid: d1deda2310a3a7241a8e0d559585b30d,
type: 3}
propertyPath: m_RootOrder
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2018962972499165240, guid: d1deda2310a3a7241a8e0d559585b30d,
type: 3}
propertyPath: m_AnchorMax.x
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 2018962972499165240, guid: d1deda2310a3a7241a8e0d559585b30d,
type: 3}
propertyPath: m_AnchorMax.y
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 2018962972499165240, guid: d1deda2310a3a7241a8e0d559585b30d,
type: 3}
propertyPath: m_AnchorMin.x
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 2018962972499165240, guid: d1deda2310a3a7241a8e0d559585b30d,
type: 3}
propertyPath: m_AnchorMin.y
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 2018962972499165240, guid: d1deda2310a3a7241a8e0d559585b30d,
type: 3}
propertyPath: m_SizeDelta.x
value: 46
objectReference: {fileID: 0}
- target: {fileID: 2018962972499165240, guid: d1deda2310a3a7241a8e0d559585b30d,
type: 3}
propertyPath: m_SizeDelta.y
value: 16
objectReference: {fileID: 0}
- target: {fileID: 2018962972499165240, guid: d1deda2310a3a7241a8e0d559585b30d,
type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2018962972499165240, guid: d1deda2310a3a7241a8e0d559585b30d,
type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2018962972499165240, guid: d1deda2310a3a7241a8e0d559585b30d,
type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2018962972499165240, guid: d1deda2310a3a7241a8e0d559585b30d,
type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 2018962972499165240, guid: d1deda2310a3a7241a8e0d559585b30d,
type: 3}
propertyPath: m_LocalRotation.x
value: -0
objectReference: {fileID: 0}
- target: {fileID: 2018962972499165240, guid: d1deda2310a3a7241a8e0d559585b30d,
type: 3}
propertyPath: m_LocalRotation.y
value: -0
objectReference: {fileID: 0}
- target: {fileID: 2018962972499165240, guid: d1deda2310a3a7241a8e0d559585b30d,
type: 3}
propertyPath: m_LocalRotation.z
value: -0
objectReference: {fileID: 0}
- target: {fileID: 2018962972499165240, guid: d1deda2310a3a7241a8e0d559585b30d,
type: 3}
propertyPath: m_AnchoredPosition.x
value: -23
objectReference: {fileID: 0}
- target: {fileID: 2018962972499165240, guid: d1deda2310a3a7241a8e0d559585b30d,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 8
objectReference: {fileID: 0}
- target: {fileID: 2018962972499165240, guid: d1deda2310a3a7241a8e0d559585b30d,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2018962972499165240, guid: d1deda2310a3a7241a8e0d559585b30d,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2018962972499165240, guid: d1deda2310a3a7241a8e0d559585b30d,
type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2018962972499165241, guid: d1deda2310a3a7241a8e0d559585b30d,
type: 3}
propertyPath: m_Name
value: PFUIText
objectReference: {fileID: 0}
- target: {fileID: 2018962972499165246, guid: d1deda2310a3a7241a8e0d559585b30d,
type: 3}
propertyPath: m_Text
value: HOT
objectReference: {fileID: 0}
- target: {fileID: 2018962972499165246, guid: d1deda2310a3a7241a8e0d559585b30d,
type: 3}
propertyPath: m_Color.b
value: 1
objectReference: {fileID: 0}
- target: {fileID: 2018962972499165246, guid: d1deda2310a3a7241a8e0d559585b30d,
type: 3}
propertyPath: m_Color.g
value: 1
objectReference: {fileID: 0}
- target: {fileID: 2018962972499165246, guid: d1deda2310a3a7241a8e0d559585b30d,
type: 3}
propertyPath: m_Color.r
value: 1
objectReference: {fileID: 0}
- target: {fileID: 2018962972499165246, guid: d1deda2310a3a7241a8e0d559585b30d,
type: 3}
propertyPath: m_FontData.m_Font
value:
objectReference: {fileID: 12800000, guid: 1db9e217733971041be26b076fda6083,
type: 3}
- target: {fileID: 2018962972499165246, guid: d1deda2310a3a7241a8e0d559585b30d,
type: 3}
propertyPath: m_FontData.m_MinSize
value: 1
objectReference: {fileID: 0}
- target: {fileID: 2018962972499165246, guid: d1deda2310a3a7241a8e0d559585b30d,
type: 3}
propertyPath: m_FontData.m_FontSize
value: 12
objectReference: {fileID: 0}
- target: {fileID: 2018962972499165246, guid: d1deda2310a3a7241a8e0d559585b30d,
type: 3}
propertyPath: m_FontData.m_Alignment
value: 4
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: d1deda2310a3a7241a8e0d559585b30d, type: 3}
--- !u!224 &8514581898389219816 stripped
RectTransform:
m_CorrespondingSourceObject: {fileID: 2018962972499165240, guid: d1deda2310a3a7241a8e0d559585b30d,
type: 3}
m_PrefabInstance: {fileID: 7650792506464872912}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &7722923011652269683
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 1644731075966996399}
m_Modifications:
- target: {fileID: 2018962972499165240, guid: d1deda2310a3a7241a8e0d559585b30d,
type: 3}
propertyPath: m_Pivot.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2018962972499165240, guid: d1deda2310a3a7241a8e0d559585b30d,
type: 3}
propertyPath: m_Pivot.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 2018962972499165240, guid: d1deda2310a3a7241a8e0d559585b30d,
type: 3}
propertyPath: m_RootOrder
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2018962972499165240, guid: d1deda2310a3a7241a8e0d559585b30d,
type: 3}
propertyPath: m_AnchorMax.x
value: 1
objectReference: {fileID: 0}
- target: {fileID: 2018962972499165240, guid: d1deda2310a3a7241a8e0d559585b30d,
type: 3}
propertyPath: m_AnchorMax.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 2018962972499165240, guid: d1deda2310a3a7241a8e0d559585b30d,
type: 3}
propertyPath: m_AnchorMin.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2018962972499165240, guid: d1deda2310a3a7241a8e0d559585b30d,
type: 3}
propertyPath: m_AnchorMin.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 2018962972499165240, guid: d1deda2310a3a7241a8e0d559585b30d,
type: 3}
propertyPath: m_SizeDelta.x
value: -24
objectReference: {fileID: 0}
- target: {fileID: 2018962972499165240, guid: d1deda2310a3a7241a8e0d559585b30d,
type: 3}
propertyPath: m_SizeDelta.y
value: 17
objectReference: {fileID: 0}
- target: {fileID: 2018962972499165240, guid: d1deda2310a3a7241a8e0d559585b30d,
type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2018962972499165240, guid: d1deda2310a3a7241a8e0d559585b30d,
type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2018962972499165240, guid: d1deda2310a3a7241a8e0d559585b30d,
type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2018962972499165240, guid: d1deda2310a3a7241a8e0d559585b30d,
type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 2018962972499165240, guid: d1deda2310a3a7241a8e0d559585b30d,
type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2018962972499165240, guid: d1deda2310a3a7241a8e0d559585b30d,
type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2018962972499165240, guid: d1deda2310a3a7241a8e0d559585b30d,
type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2018962972499165240, guid: d1deda2310a3a7241a8e0d559585b30d,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 12
objectReference: {fileID: 0}
- target: {fileID: 2018962972499165240, guid: d1deda2310a3a7241a8e0d559585b30d,
type: 3}
propertyPath: m_AnchoredPosition.y
value: -10
objectReference: {fileID: 0}
- target: {fileID: 2018962972499165240, guid: d1deda2310a3a7241a8e0d559585b30d,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2018962972499165240, guid: d1deda2310a3a7241a8e0d559585b30d,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2018962972499165240, guid: d1deda2310a3a7241a8e0d559585b30d,
type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2018962972499165241, guid: d1deda2310a3a7241a8e0d559585b30d,
type: 3}
propertyPath: m_Name
value: name
objectReference: {fileID: 0}
- target: {fileID: 2018962972499165246, guid: d1deda2310a3a7241a8e0d559585b30d,
type: 3}
propertyPath: m_Text
value: Name
objectReference: {fileID: 0}
- target: {fileID: 2018962972499165246, guid: d1deda2310a3a7241a8e0d559585b30d,
type: 3}
propertyPath: m_Color.b
value: 1
objectReference: {fileID: 0}
- target: {fileID: 2018962972499165246, guid: d1deda2310a3a7241a8e0d559585b30d,
type: 3}
propertyPath: m_Color.g
value: 1
objectReference: {fileID: 0}
- target: {fileID: 2018962972499165246, guid: d1deda2310a3a7241a8e0d559585b30d,
type: 3}
propertyPath: m_Color.r
value: 1
objectReference: {fileID: 0}
- target: {fileID: 2018962972499165246, guid: d1deda2310a3a7241a8e0d559585b30d,
type: 3}
propertyPath: m_FontData.m_Font
value:
objectReference: {fileID: 12800000, guid: 1db9e217733971041be26b076fda6083,
type: 3}
- target: {fileID: 2018962972499165246, guid: d1deda2310a3a7241a8e0d559585b30d,
type: 3}
propertyPath: m_FontData.m_FontStyle
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: d1deda2310a3a7241a8e0d559585b30d, type: 3}
--- !u!224 &8586563145068443211 stripped
RectTransform:
m_CorrespondingSourceObject: {fileID: 2018962972499165240, guid: d1deda2310a3a7241a8e0d559585b30d,
type: 3}
m_PrefabInstance: {fileID: 7722923011652269683}
m_PrefabAsset: {fileID: 0}

View File

@ -1,7 +1,6 @@
fileFormatVersion: 2
guid: 70c79ab2ae1f7d74ba14708c3d4a2e6d
folderAsset: yes
DefaultImporter:
guid: d29fa97d0660c0748b9b310aed0d3cf8
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:

View File

@ -145,6 +145,11 @@ PrefabInstance:
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 545917028276686471, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
type: 3}
propertyPath: m_AnchoredPosition.y
value: -58
objectReference: {fileID: 0}
- target: {fileID: 1123028309966834811, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
type: 3}
propertyPath: m_Material
@ -274,22 +279,22 @@ PrefabInstance:
- target: {fileID: 5329299856310536127, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
type: 3}
propertyPath: m_AnchorMax.y
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5329299856310536127, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
type: 3}
propertyPath: m_AnchorMin.y
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5329299856310536127, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 20
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5329299856310536127, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
type: 3}
propertyPath: m_AnchoredPosition.y
value: -9
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8688565590564084001, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
type: 3}
@ -321,6 +326,11 @@ PrefabInstance:
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 545917028276686471, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
type: 3}
propertyPath: m_AnchoredPosition.y
value: -58
objectReference: {fileID: 0}
- target: {fileID: 1123028309966834811, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
type: 3}
propertyPath: m_Material
@ -450,22 +460,22 @@ PrefabInstance:
- target: {fileID: 5329299856310536127, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
type: 3}
propertyPath: m_AnchorMax.y
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5329299856310536127, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
type: 3}
propertyPath: m_AnchorMin.y
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5329299856310536127, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 20
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5329299856310536127, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
type: 3}
propertyPath: m_AnchoredPosition.y
value: -9
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8688565590564084001, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
type: 3}
@ -497,6 +507,11 @@ PrefabInstance:
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 545917028276686471, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
type: 3}
propertyPath: m_AnchoredPosition.y
value: -58
objectReference: {fileID: 0}
- target: {fileID: 1123028309966834811, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
type: 3}
propertyPath: m_Color.b
@ -651,12 +666,12 @@ PrefabInstance:
- target: {fileID: 5329299856310536127, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
type: 3}
propertyPath: m_AnchorMax.y
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5329299856310536127, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
type: 3}
propertyPath: m_AnchorMin.y
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5329299856310536127, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
type: 3}
@ -666,12 +681,12 @@ PrefabInstance:
- target: {fileID: 5329299856310536127, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 20
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5329299856310536127, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
type: 3}
propertyPath: m_AnchoredPosition.y
value: -2
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8688565590564084001, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
type: 3}
@ -703,6 +718,11 @@ PrefabInstance:
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 545917028276686471, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
type: 3}
propertyPath: m_AnchoredPosition.y
value: -58
objectReference: {fileID: 0}
- target: {fileID: 1123028309966834811, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
type: 3}
propertyPath: m_Material
@ -832,22 +852,22 @@ PrefabInstance:
- target: {fileID: 5329299856310536127, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
type: 3}
propertyPath: m_AnchorMax.y
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5329299856310536127, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
type: 3}
propertyPath: m_AnchorMin.y
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5329299856310536127, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 20
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5329299856310536127, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
type: 3}
propertyPath: m_AnchoredPosition.y
value: -9
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8688565590564084001, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
type: 3}
@ -879,6 +899,11 @@ PrefabInstance:
propertyPath: m_SizeDelta.x
value: 40
objectReference: {fileID: 0}
- target: {fileID: 545917028276686471, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
type: 3}
propertyPath: m_AnchoredPosition.y
value: -58
objectReference: {fileID: 0}
- target: {fileID: 1123028309966834811, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
type: 3}
propertyPath: m_Material

View File

@ -337,6 +337,77 @@ MonoBehaviour:
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: Search Road
--- !u!1 &1394950112273882093
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 4377485060974967270}
- component: {fileID: 1816726353976711302}
- component: {fileID: 1565076834225339534}
m_Layer: 5
m_Name: MaskImage
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &4377485060974967270
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1394950112273882093}
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: 4609279353588439486}
m_RootOrder: 6
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1816726353976711302
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1394950112273882093}
m_CullTransparentMesh: 0
--- !u!114 &1565076834225339534
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1394950112273882093}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 1344c3c82d62a2a41a3576d8abb8e3ea, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 0.13725491, g: 0.13725491, b: 0.1764706, a: 1}
m_RaycastTarget: 1
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Texture: {fileID: 0}
m_UVRect:
serializedVersion: 2
x: 0
y: 0
width: 1
height: 1
--- !u!1 &1438309948063184099
GameObject:
m_ObjectHideFlags: 0
@ -450,6 +521,7 @@ RectTransform:
- {fileID: 6114093792508456481}
- {fileID: 9219694857725158026}
- {fileID: 6852378552522628550}
- {fileID: 4377485060974967270}
m_Father: {fileID: 3945718112839240075}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@ -935,8 +1007,8 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 2c699b8e1864b4b248acb7a04ede9480, type: 3}
m_Name:
m_EditorClassIdentifier:
_panSpeed: 1
_zoomSpeed: 0.25
_panSpeed: 2
_zoomSpeed: 1
_referenceCamera: {fileID: 0}
_mapManager: {fileID: 3945718112544175235}
_useDegreeMethod: 0
@ -1332,6 +1404,11 @@ PrefabInstance:
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 545917028276686471, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
type: 3}
propertyPath: m_AnchoredPosition.y
value: -58
objectReference: {fileID: 0}
- target: {fileID: 1123028309966834811, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
type: 3}
propertyPath: m_Material
@ -1596,12 +1673,12 @@ PrefabInstance:
- target: {fileID: 2638424933752433027, guid: a1999d0576fee6248a9c5a507ae8d10e,
type: 3}
propertyPath: m_SizeDelta.x
value: 226
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2638424933752433027, guid: a1999d0576fee6248a9c5a507ae8d10e,
type: 3}
propertyPath: m_SizeDelta.y
value: 64
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2638424933752433027, guid: a1999d0576fee6248a9c5a507ae8d10e,
type: 3}

File diff suppressed because it is too large Load Diff

View File

@ -1,7 +1,6 @@
fileFormatVersion: 2
guid: 28846541fe6079246969686c44014e51
folderAsset: yes
DefaultImporter:
guid: eb902f6119ebafe4e83df435a9287faa
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:

View File

@ -208,6 +208,84 @@ RectTransform:
m_AnchoredPosition: {x: 415, y: -40}
m_SizeDelta: {x: 274, y: 73}
m_Pivot: {x: 0, y: 1}
--- !u!1 &821335241954842408
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 2018388856339575706}
- component: {fileID: 3799652773543315128}
- component: {fileID: 7415062289742581368}
m_Layer: 5
m_Name: Unit
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &2018388856339575706
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 821335241954842408}
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: 8698039833564966881}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 1, y: 0.5}
m_AnchorMax: {x: 1, y: 0.5}
m_AnchoredPosition: {x: -20, y: 0}
m_SizeDelta: {x: 31, y: 20}
m_Pivot: {x: 1, y: 0.5}
--- !u!222 &3799652773543315128
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 821335241954842408}
m_CullTransparentMesh: 0
--- !u!114 &7415062289742581368
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 821335241954842408}
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.36078432, g: 0.36078432, b: 0.43137258, a: 1}
m_RaycastTarget: 1
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_FontData:
m_Font: {fileID: 12800000, guid: 1db9e217733971041be26b076fda6083, type: 3}
m_FontSize: 14
m_FontStyle: 0
m_BestFit: 0
m_MinSize: 10
m_MaxSize: 40
m_Alignment: 5
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: MM
--- !u!1 &956475305525563487
GameObject:
m_ObjectHideFlags: 0
@ -358,6 +436,7 @@ RectTransform:
- {fileID: 6793074959398544408}
- {fileID: 4499205945845230731}
- {fileID: 1569894540830352816}
- {fileID: 381125011854744830}
- {fileID: 6078028875546532601}
- {fileID: 4691314474035008895}
- {fileID: 4499205944832415859}
@ -382,6 +461,84 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 6d865b6d0ecb54044a4600bc590d8c29, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1 &1273472110172321477
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 5319161592036447294}
- component: {fileID: 6856005623792070645}
- component: {fileID: 760440415804788684}
m_Layer: 5
m_Name: Unit
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &5319161592036447294
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1273472110172321477}
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: 8698039832891251293}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 1, y: 0.5}
m_AnchorMax: {x: 1, y: 0.5}
m_AnchoredPosition: {x: -20, y: 0}
m_SizeDelta: {x: 31, y: 20}
m_Pivot: {x: 1, y: 0.5}
--- !u!222 &6856005623792070645
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1273472110172321477}
m_CullTransparentMesh: 0
--- !u!114 &760440415804788684
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1273472110172321477}
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.36078432, g: 0.36078432, b: 0.43137258, a: 1}
m_RaycastTarget: 1
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_FontData:
m_Font: {fileID: 12800000, guid: 1db9e217733971041be26b076fda6083, type: 3}
m_FontSize: 14
m_FontStyle: 0
m_BestFit: 0
m_MinSize: 10
m_MaxSize: 40
m_Alignment: 5
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: KG
--- !u!1 &1430963830256375805
GameObject:
m_ObjectHideFlags: 0
@ -1165,7 +1322,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1}
m_Color: {r: 0.36078432, g: 0.36078432, b: 0.43137255, a: 1}
m_RaycastTarget: 1
m_Maskable: 1
m_OnCullStateChanged:
@ -1938,6 +2095,84 @@ MonoBehaviour:
m_EditorClassIdentifier:
m_HorizontalFit: 2
m_VerticalFit: 0
--- !u!1 &3097023329138281688
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1728457861112749299}
- component: {fileID: 2913741589045964048}
- component: {fileID: 7811826741715651250}
m_Layer: 5
m_Name: Unit
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &1728457861112749299
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3097023329138281688}
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: 8698039833552491262}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 1, y: 0.5}
m_AnchorMax: {x: 1, y: 0.5}
m_AnchoredPosition: {x: -20, y: 0}
m_SizeDelta: {x: 31, y: 20}
m_Pivot: {x: 1, y: 0.5}
--- !u!222 &2913741589045964048
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3097023329138281688}
m_CullTransparentMesh: 0
--- !u!114 &7811826741715651250
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3097023329138281688}
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.36078432, g: 0.36078432, b: 0.43137258, a: 1}
m_RaycastTarget: 1
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_FontData:
m_Font: {fileID: 12800000, guid: 1db9e217733971041be26b076fda6083, type: 3}
m_FontSize: 14
m_FontStyle: 0
m_BestFit: 0
m_MinSize: 10
m_MaxSize: 40
m_Alignment: 5
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: KG
--- !u!1 &3421880255376027768
GameObject:
m_ObjectHideFlags: 0
@ -2373,7 +2608,7 @@ RectTransform:
- {fileID: 4691314475355282599}
- {fileID: 7867955887922114904}
m_Father: {fileID: 956475306156679521}
m_RootOrder: 9
m_RootOrder: 10
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
@ -2740,7 +2975,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 1}
m_AnchorMax: {x: 0.5, y: 1}
m_AnchoredPosition: {x: 0, y: -50}
m_AnchoredPosition: {x: 0, y: -58}
m_SizeDelta: {x: 0, y: 34}
m_Pivot: {x: 0.5, y: 1}
--- !u!222 &5538971169794999911
@ -3814,7 +4049,7 @@ RectTransform:
- {fileID: 6078028875826647841}
- {fileID: 8679283750394117854}
m_Father: {fileID: 956475306156679521}
m_RootOrder: 8
m_RootOrder: 9
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
@ -4032,7 +4267,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 1}
m_AnchorMax: {x: 0.5, y: 1}
m_AnchoredPosition: {x: 0, y: -50}
m_AnchoredPosition: {x: 0, y: -58}
m_SizeDelta: {x: 0, y: 34}
m_Pivot: {x: 0.5, y: 1}
--- !u!222 &6457592632356309473
@ -4136,6 +4371,84 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
radius: 17
--- !u!1 &6282317594484996498
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 3816434181731277215}
- component: {fileID: 6050184882012969629}
- component: {fileID: 5490119320765753047}
m_Layer: 5
m_Name: Unit
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &3816434181731277215
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6282317594484996498}
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: 8698039831671925482}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 1, y: 0.5}
m_AnchorMax: {x: 1, y: 0.5}
m_AnchoredPosition: {x: -20, y: 0}
m_SizeDelta: {x: 31, y: 20}
m_Pivot: {x: 1, y: 0.5}
--- !u!222 &6050184882012969629
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6282317594484996498}
m_CullTransparentMesh: 0
--- !u!114 &5490119320765753047
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6282317594484996498}
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.36078432, g: 0.36078432, b: 0.43137258, a: 1}
m_RaycastTarget: 1
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_FontData:
m_Font: {fileID: 12800000, guid: 1db9e217733971041be26b076fda6083, type: 3}
m_FontSize: 14
m_FontStyle: 0
m_BestFit: 0
m_MinSize: 10
m_MaxSize: 40
m_Alignment: 5
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: BPM
--- !u!1 &7762191863046212826
GameObject:
m_ObjectHideFlags: 0
@ -4221,6 +4534,172 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
radius: 70
--- !u!1 &8123422662560869943
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 381125011854744830}
- component: {fileID: 4845237385284378173}
- component: {fileID: 5149655297030004105}
- component: {fileID: 5282762711194151699}
m_Layer: 5
m_Name: LTPanel
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &381125011854744830
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8123422662560869943}
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: 956475306156679521}
m_RootOrder: 8
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 60, y: -30}
m_SizeDelta: {x: 118, y: 64}
m_Pivot: {x: 0, y: 1}
--- !u!222 &4845237385284378173
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8123422662560869943}
m_CullTransparentMesh: 0
--- !u!114 &5149655297030004105
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8123422662560869943}
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.13725491, g: 0.13725491, b: 0.1764706, a: 0.8}
m_RaycastTarget: 1
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 0}
m_Type: 1
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!114 &5282762711194151699
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8123422662560869943}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: adb30198aa32dd140b5750692dd48104, type: 3}
m_Name:
m_EditorClassIdentifier:
radius: 32
--- !u!1 &8211716632784190946
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 993703589525712116}
- component: {fileID: 547430139547077235}
- component: {fileID: 6980507802082684031}
m_Layer: 5
m_Name: Unit
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &993703589525712116
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8211716632784190946}
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: 8698039832972322733}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 1, y: 0.5}
m_AnchorMax: {x: 1, y: 0.5}
m_AnchoredPosition: {x: -20, y: 0}
m_SizeDelta: {x: 31, y: 20}
m_Pivot: {x: 1, y: 0.5}
--- !u!222 &547430139547077235
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8211716632784190946}
m_CullTransparentMesh: 0
--- !u!114 &6980507802082684031
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8211716632784190946}
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.36078432, g: 0.36078432, b: 0.43137258, a: 1}
m_RaycastTarget: 1
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_FontData:
m_Font: {fileID: 12800000, guid: 1db9e217733971041be26b076fda6083, type: 3}
m_FontSize: 14
m_FontStyle: 0
m_BestFit: 0
m_MinSize: 10
m_MaxSize: 40
m_Alignment: 5
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: CM
--- !u!1 &8227621284685144316
GameObject:
m_ObjectHideFlags: 0
@ -4329,7 +4808,7 @@ PrefabInstance:
- target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
type: 3}
propertyPath: m_RootOrder
value: 10
value: 11
objectReference: {fileID: 0}
- target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
type: 3}
@ -4494,7 +4973,7 @@ PrefabInstance:
- target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
type: 3}
propertyPath: m_RootOrder
value: 11
value: 12
objectReference: {fileID: 0}
- target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
type: 3}
@ -6909,7 +7388,7 @@ PrefabInstance:
- target: {fileID: 3150550772916003707, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
type: 3}
propertyPath: m_Text
value: DEFINE
value: EDIT
objectReference: {fileID: 0}
- target: {fileID: 5329299856310536127, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
type: 3}
@ -7091,6 +7570,11 @@ PrefabInstance:
propertyPath: m_Name
value: UnitDropdown
objectReference: {fileID: 0}
- target: {fileID: 2531553338690931336, guid: 5ee52e0b78bd38244a2b473e2236800c,
type: 3}
propertyPath: m_Interactable
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6258245508770672658, guid: 5ee52e0b78bd38244a2b473e2236800c,
type: 3}
propertyPath: m_Pivot.x

View File

@ -140,11 +140,11 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 3292737747453648276}
- {fileID: 6134162133417953293}
- {fileID: 6653062728990783300}
- {fileID: 1879042590406371758}
- {fileID: 1264410277530038736}
- {fileID: 2240393815621593325}
- {fileID: 6134162133417953293}
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@ -914,7 +914,7 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 465239219729653177}
m_RootOrder: 5
m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
@ -2651,7 +2651,7 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 465239219729653177}
m_RootOrder: 4
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
@ -3969,7 +3969,7 @@ RectTransform:
- {fileID: 1429559311419137021}
- {fileID: 1856582807434622599}
m_Father: {fileID: 465239219729653177}
m_RootOrder: 2
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 1}
m_AnchorMax: {x: 0.5, y: 1}
@ -4209,7 +4209,7 @@ RectTransform:
m_Children:
- {fileID: 3950243154990735955}
m_Father: {fileID: 465239219729653177}
m_RootOrder: 3
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
@ -4375,6 +4375,11 @@ PrefabInstance:
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 545917028276686471, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
type: 3}
propertyPath: m_AnchoredPosition.y
value: -58
objectReference: {fileID: 0}
- target: {fileID: 1123028309966834811, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
type: 3}
propertyPath: m_Material
@ -4683,6 +4688,12 @@ PrefabInstance:
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 5ee52e0b78bd38244a2b473e2236800c, type: 3}
--- !u!1 &8149286171844735752 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 4089475371085219485, guid: 5ee52e0b78bd38244a2b473e2236800c,
type: 3}
m_PrefabInstance: {fileID: 5321188461237024149}
m_PrefabAsset: {fileID: 0}
--- !u!1 &5464789140640568869 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 148192672769352624, guid: 5ee52e0b78bd38244a2b473e2236800c,
@ -4707,18 +4718,18 @@ GameObject:
type: 3}
m_PrefabInstance: {fileID: 5321188461237024149}
m_PrefabAsset: {fileID: 0}
--- !u!1 &5779092891361109961 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 1867831574853112412, guid: 5ee52e0b78bd38244a2b473e2236800c,
type: 3}
m_PrefabInstance: {fileID: 5321188461237024149}
m_PrefabAsset: {fileID: 0}
--- !u!1 &3075247155673026290 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 7166863393051868007, guid: 5ee52e0b78bd38244a2b473e2236800c,
type: 3}
m_PrefabInstance: {fileID: 5321188461237024149}
m_PrefabAsset: {fileID: 0}
--- !u!1 &5779092891361109961 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 1867831574853112412, guid: 5ee52e0b78bd38244a2b473e2236800c,
type: 3}
m_PrefabInstance: {fileID: 5321188461237024149}
m_PrefabAsset: {fileID: 0}
--- !u!1 &6398833330297696636 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 1231050277644289257, guid: 5ee52e0b78bd38244a2b473e2236800c,
@ -4731,12 +4742,6 @@ GameObject:
type: 3}
m_PrefabInstance: {fileID: 5321188461237024149}
m_PrefabAsset: {fileID: 0}
--- !u!1 &8149286171844735752 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 4089475371085219485, guid: 5ee52e0b78bd38244a2b473e2236800c,
type: 3}
m_PrefabInstance: {fileID: 5321188461237024149}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &6073211655158443556
PrefabInstance:
m_ObjectHideFlags: 0
@ -4882,15 +4887,21 @@ GameObject:
type: 3}
m_PrefabInstance: {fileID: 6073211655158443556}
m_PrefabAsset: {fileID: 0}
--- !u!1 &5594525415673429112 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 1867831574853112412, guid: 5ee52e0b78bd38244a2b473e2236800c,
type: 3}
m_PrefabInstance: {fileID: 6073211655158443556}
m_PrefabAsset: {fileID: 0}
--- !u!224 &185106026378206774 stripped
RectTransform:
m_CorrespondingSourceObject: {fileID: 6258245508770672658, guid: 5ee52e0b78bd38244a2b473e2236800c,
type: 3}
m_PrefabInstance: {fileID: 6073211655158443556}
m_PrefabAsset: {fileID: 0}
--- !u!1 &6216688916544654740 stripped
--- !u!1 &4998415483215112909 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 148192672769352624, guid: 5ee52e0b78bd38244a2b473e2236800c,
m_CorrespondingSourceObject: {fileID: 1231050277644289257, guid: 5ee52e0b78bd38244a2b473e2236800c,
type: 3}
m_PrefabInstance: {fileID: 6073211655158443556}
m_PrefabAsset: {fileID: 0}
@ -4912,24 +4923,18 @@ GameObject:
type: 3}
m_PrefabInstance: {fileID: 6073211655158443556}
m_PrefabAsset: {fileID: 0}
--- !u!1 &5594525415673429112 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 1867831574853112412, guid: 5ee52e0b78bd38244a2b473e2236800c,
type: 3}
m_PrefabInstance: {fileID: 6073211655158443556}
m_PrefabAsset: {fileID: 0}
--- !u!1 &4998415483215112909 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 1231050277644289257, guid: 5ee52e0b78bd38244a2b473e2236800c,
type: 3}
m_PrefabInstance: {fileID: 6073211655158443556}
m_PrefabAsset: {fileID: 0}
--- !u!1 &3745822250017908288 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 7472514873862735972, guid: 5ee52e0b78bd38244a2b473e2236800c,
type: 3}
m_PrefabInstance: {fileID: 6073211655158443556}
m_PrefabAsset: {fileID: 0}
--- !u!1 &6216688916544654740 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 148192672769352624, guid: 5ee52e0b78bd38244a2b473e2236800c,
type: 3}
m_PrefabInstance: {fileID: 6073211655158443556}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &6653062728498872177
PrefabInstance:
m_ObjectHideFlags: 0
@ -5049,18 +5054,18 @@ PrefabInstance:
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 07e45aecba1a2d542b043157aa2e9322, type: 3}
--- !u!224 &7944455583227005010 stripped
RectTransform:
m_CorrespondingSourceObject: {fileID: 3608523562535466787, guid: 07e45aecba1a2d542b043157aa2e9322,
type: 3}
m_PrefabInstance: {fileID: 6653062728498872177}
m_PrefabAsset: {fileID: 0}
--- !u!1 &6709540780725584165 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 92744388873403988, guid: 07e45aecba1a2d542b043157aa2e9322,
type: 3}
m_PrefabInstance: {fileID: 6653062728498872177}
m_PrefabAsset: {fileID: 0}
--- !u!224 &7944455583227005010 stripped
RectTransform:
m_CorrespondingSourceObject: {fileID: 3608523562535466787, guid: 07e45aecba1a2d542b043157aa2e9322,
type: 3}
m_PrefabInstance: {fileID: 6653062728498872177}
m_PrefabAsset: {fileID: 0}
--- !u!1 &4976321847170018841 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 1827088261433348456, guid: 07e45aecba1a2d542b043157aa2e9322,
@ -5094,6 +5099,46 @@ PrefabInstance:
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1409429025663639838, guid: a1999d0576fee6248a9c5a507ae8d10e,
type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1409429025663639838, guid: a1999d0576fee6248a9c5a507ae8d10e,
type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1409429025663639838, guid: a1999d0576fee6248a9c5a507ae8d10e,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1409429025663639838, guid: a1999d0576fee6248a9c5a507ae8d10e,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1450106334936664745, guid: a1999d0576fee6248a9c5a507ae8d10e,
type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1450106334936664745, guid: a1999d0576fee6248a9c5a507ae8d10e,
type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1450106334936664745, guid: a1999d0576fee6248a9c5a507ae8d10e,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1450106334936664745, guid: a1999d0576fee6248a9c5a507ae8d10e,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1617869899094122649, guid: a1999d0576fee6248a9c5a507ae8d10e,
type: 3}
propertyPath: m_SizeDelta.x
@ -5142,7 +5187,7 @@ PrefabInstance:
- target: {fileID: 2638424933752433027, guid: a1999d0576fee6248a9c5a507ae8d10e,
type: 3}
propertyPath: m_RootOrder
value: 1
value: 5
objectReference: {fileID: 0}
- target: {fileID: 2638424933752433027, guid: a1999d0576fee6248a9c5a507ae8d10e,
type: 3}
@ -5167,12 +5212,12 @@ PrefabInstance:
- target: {fileID: 2638424933752433027, guid: a1999d0576fee6248a9c5a507ae8d10e,
type: 3}
propertyPath: m_SizeDelta.x
value: 226
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2638424933752433027, guid: a1999d0576fee6248a9c5a507ae8d10e,
type: 3}
propertyPath: m_SizeDelta.y
value: 64
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2638424933752433027, guid: a1999d0576fee6248a9c5a507ae8d10e,
type: 3}
@ -5249,6 +5294,26 @@ PrefabInstance:
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4204578097682859198, guid: a1999d0576fee6248a9c5a507ae8d10e,
type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4204578097682859198, guid: a1999d0576fee6248a9c5a507ae8d10e,
type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4204578097682859198, guid: a1999d0576fee6248a9c5a507ae8d10e,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4204578097682859198, guid: a1999d0576fee6248a9c5a507ae8d10e,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4586126367539938617, guid: a1999d0576fee6248a9c5a507ae8d10e,
type: 3}
propertyPath: m_SizeDelta.x
@ -5334,6 +5399,26 @@ PrefabInstance:
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 9135822971364406318, guid: a1999d0576fee6248a9c5a507ae8d10e,
type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 9135822971364406318, guid: a1999d0576fee6248a9c5a507ae8d10e,
type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 9135822971364406318, guid: a1999d0576fee6248a9c5a507ae8d10e,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 9135822971364406318, guid: a1999d0576fee6248a9c5a507ae8d10e,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: a1999d0576fee6248a9c5a507ae8d10e, type: 3}
--- !u!224 &6134162133417953293 stripped

View File

@ -386,7 +386,7 @@ RectTransform:
- {fileID: 1879534887716360359}
- {fileID: 3908859068725394776}
m_Father: {fileID: 5404217439901075764}
m_RootOrder: 1
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
@ -526,7 +526,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 1}
m_AnchorMax: {x: 0.5, y: 1}
m_AnchoredPosition: {x: 0, y: -50}
m_AnchoredPosition: {x: 0, y: -58}
m_SizeDelta: {x: 0, y: 34}
m_Pivot: {x: 0.5, y: 1}
--- !u!222 &1716423704532503143
@ -909,6 +909,94 @@ MonoBehaviour:
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: times
--- !u!1 &3201984282376345136
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 4876487271982587869}
- component: {fileID: 2260727799122030265}
- component: {fileID: 4402049335017691716}
- component: {fileID: 8230274760154259895}
m_Layer: 5
m_Name: LTPanel
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &4876487271982587869
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3201984282376345136}
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: 5404217439901075764}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 60, y: -30}
m_SizeDelta: {x: 118, y: 64}
m_Pivot: {x: 0, y: 1}
--- !u!222 &2260727799122030265
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3201984282376345136}
m_CullTransparentMesh: 0
--- !u!114 &4402049335017691716
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3201984282376345136}
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.13725491, g: 0.13725491, b: 0.1764706, a: 0.8}
m_RaycastTarget: 1
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 0}
m_Type: 1
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!114 &8230274760154259895
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3201984282376345136}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: adb30198aa32dd140b5750692dd48104, type: 3}
m_Name:
m_EditorClassIdentifier:
radius: 32
--- !u!1 &3384042931061406690
GameObject:
m_ObjectHideFlags: 0
@ -971,7 +1059,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 0.20784314, g: 0.20784314, b: 0.2627451, a: 1}
m_Color: {r: 0.13725491, g: 0.13725491, b: 0.1764706, a: 0.6509804}
m_RaycastTarget: 1
m_Maskable: 1
m_OnCullStateChanged:
@ -1062,7 +1150,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 0.20784314, g: 0.20784314, b: 0.2627451, a: 1}
m_Color: {r: 0.13725491, g: 0.13725491, b: 0.1764706, a: 0.6509804}
m_RaycastTarget: 1
m_Maskable: 1
m_OnCullStateChanged:
@ -1558,7 +1646,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 0.20784314, g: 0.20784314, b: 0.2627451, a: 1}
m_Color: {r: 0.13725491, g: 0.13725491, b: 0.1764706, a: 0.6509804}
m_RaycastTarget: 1
m_Maskable: 1
m_OnCullStateChanged:
@ -1649,7 +1737,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 0.20784314, g: 0.20784314, b: 0.2627451, a: 1}
m_Color: {r: 0.13725491, g: 0.13725491, b: 0.1764706, a: 0.6509804}
m_RaycastTarget: 1
m_Maskable: 1
m_OnCullStateChanged:
@ -1678,6 +1766,80 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
radius: 30
--- !u!1 &4942029506225374654
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 4945080816380747117}
- component: {fileID: 1002548830126738735}
- component: {fileID: 3346485444472629278}
m_Layer: 5
m_Name: SexIcon
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &4945080816380747117
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4942029506225374654}
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: 6411762837200755527}
m_RootOrder: 14
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 91, y: -171}
m_SizeDelta: {x: 24, y: 24}
m_Pivot: {x: 0, y: 1}
--- !u!222 &1002548830126738735
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4942029506225374654}
m_CullTransparentMesh: 0
--- !u!114 &3346485444472629278
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4942029506225374654}
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: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: 2a3c5c12765c1da43901afbec2c179f2, type: 3}
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!1 &5049100858162210264
GameObject:
m_ObjectHideFlags: 0
@ -2153,6 +2315,7 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 6411762837200755527}
- {fileID: 4876487271982587869}
- {fileID: 1879534888550127999}
- {fileID: 8802067605570913056}
m_Father: {fileID: 5404217438093112801}
@ -2785,6 +2948,7 @@ RectTransform:
- {fileID: 6411762837444288610}
- {fileID: 6411762837061016328}
- {fileID: 6411762836543330313}
- {fileID: 4945080816380747117}
m_Father: {fileID: 5404217439901075764}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@ -4709,7 +4873,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 0.20784314, g: 0.20784314, b: 0.2627451, a: 1}
m_Color: {r: 0.13725491, g: 0.13725491, b: 0.1764706, a: 0.6509804}
m_RaycastTarget: 1
m_Maskable: 1
m_OnCullStateChanged:
@ -4772,7 +4936,7 @@ RectTransform:
- {fileID: 8802067606874180344}
- {fileID: 6200687317142480647}
m_Father: {fileID: 5404217439901075764}
m_RootOrder: 2
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
@ -4990,7 +5154,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 1}
m_AnchorMax: {x: 0.5, y: 1}
m_AnchoredPosition: {x: 0, y: -50}
m_AnchoredPosition: {x: 0, y: -58}
m_SizeDelta: {x: 0, y: 34}
m_Pivot: {x: 0.5, y: 1}
--- !u!222 &8638955888985804856

View File

@ -497,7 +497,7 @@ MonoBehaviour:
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: "You haven\u2019t get a match yet"
m_Text: Found Nothing
--- !u!1 &7007734862324335738
GameObject:
m_ObjectHideFlags: 0

View File

@ -15,7 +15,7 @@ GameObject:
- component: {fileID: 112077214919202944}
- component: {fileID: 1578934454411558168}
- component: {fileID: 8153319542030502509}
- component: {fileID: 2290594246778007045}
- component: {fileID: 3688729358500726461}
m_Layer: 5
m_Name: ToastContainer
m_TagString: Untagged
@ -42,7 +42,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: 227, y: 0}
m_SizeDelta: {x: 0, y: 48}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1964787418795620593
CanvasRenderer:
@ -132,9 +132,9 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3}
m_Name:
m_EditorClassIdentifier:
m_HorizontalFit: 0
m_VerticalFit: 2
--- !u!114 &2290594246778007045
m_HorizontalFit: 2
m_VerticalFit: 0
--- !u!114 &3688729358500726461
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
@ -148,16 +148,16 @@ MonoBehaviour:
m_EditorClassIdentifier:
m_Padding:
m_Left: 20
m_Right: 0
m_Right: 20
m_Top: 12
m_Bottom: 12
m_ChildAlignment: 3
m_Spacing: 20
m_ChildAlignment: 4
m_Spacing: 10
m_ChildForceExpandWidth: 1
m_ChildForceExpandHeight: 1
m_ChildControlWidth: 0
m_ChildControlHeight: 0
m_ChildScaleWidth: 0
m_ChildScaleWidth: 1
m_ChildScaleHeight: 0
--- !u!1 &3711362548065282552
GameObject:
@ -169,8 +169,8 @@ GameObject:
m_Component:
- component: {fileID: 5008244665294165580}
- component: {fileID: 5181308658082223272}
- component: {fileID: 7408275987611877051}
- component: {fileID: 3212646786526738585}
- component: {fileID: 5789125156700906347}
- component: {fileID: 8568980804807182099}
m_Layer: 5
m_Name: Container
m_TagString: Untagged
@ -195,8 +195,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 74, y: 0}
m_SizeDelta: {x: 143, y: 0}
m_AnchoredPosition: {x: 54, y: 0}
m_SizeDelta: {x: 0, y: 19}
m_Pivot: {x: 0, y: 0.5}
--- !u!222 &5181308658082223272
CanvasRenderer:
@ -206,7 +206,7 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3711362548065282552}
m_CullTransparentMesh: 0
--- !u!114 &7408275987611877051
--- !u!114 &5789125156700906347
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
@ -215,7 +215,21 @@ MonoBehaviour:
m_GameObject: {fileID: 3711362548065282552}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 59f8146938fff824cb5fd77236b75775, type: 3}
m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3}
m_Name:
m_EditorClassIdentifier:
m_HorizontalFit: 2
m_VerticalFit: 0
--- !u!114 &8568980804807182099
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3711362548065282552}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 30649d3a9faa99c48a7b1166b86bf2a0, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Padding:
@ -228,23 +242,9 @@ MonoBehaviour:
m_ChildForceExpandWidth: 1
m_ChildForceExpandHeight: 1
m_ChildControlWidth: 1
m_ChildControlHeight: 1
m_ChildControlHeight: 0
m_ChildScaleWidth: 0
m_ChildScaleHeight: 0
--- !u!114 &3212646786526738585
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3711362548065282552}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3}
m_Name:
m_EditorClassIdentifier:
m_HorizontalFit: 0
m_VerticalFit: 2
--- !u!1 &5551920471330652729
GameObject:
m_ObjectHideFlags: 0
@ -355,7 +355,7 @@ RectTransform:
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 143, y: 0}
m_SizeDelta: {x: 0, y: 19}
m_Pivot: {x: 0, y: 0.5}
--- !u!222 &3132621560751603177
CanvasRenderer:
@ -410,5 +410,5 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3}
m_Name:
m_EditorClassIdentifier:
m_HorizontalFit: 0
m_VerticalFit: 2
m_HorizontalFit: 2
m_VerticalFit: 0

File diff suppressed because it is too large Load Diff

View File

@ -1,5 +1,4 @@
using Assets.Cyp.Common;
using System;
using System;
using System.Collections;
using System.Collections.Generic;
using System.Linq;

View File

@ -1,4 +1,4 @@
using Assets.Cyp.Common;
using Assets.Scripts;
using System.Collections;
using UnityEngine;
using UnityEngine.Networking;

View File

@ -10,10 +10,10 @@ using System;
using Assets.Scenes.Ride.Scripts.Model;
using UnityEngine.SceneManagement;
using System.Collections.Generic;
using Assets.Cyp.Common;
using System.Threading.Tasks;
using UnityEngine.EventSystems;
using ChartAndGraph;
using Assets.Scripts;
namespace Assets.Scenes.Ride.Scripts
{

View File

@ -126,5 +126,12 @@ namespace Assets.Scripts.Apis
return Get<JsonResult<MapRouteRankingList>>(url);
}
public async Task<JsonResult<object>> GetEarthData(double lat, double lon)
{
var result = await GetAsync<JsonResult<object>>($"Map/GetEarthData?lat={ lat }&lon={ lon }");
return result;
}
}
}

View File

@ -146,7 +146,7 @@ namespace Assets.Scripts.Devices.Ant
private void Log(string str)
{
//System.IO.File.AppendAllText(@"D:\work\PowerFun\PowerFun-Unity\Build\log.txt", str+"\r\n");
Debug.LogError(str);
//Debug.LogError(str);
}
private void antDevice_serialError(ANT_Device sender, ANT_Device.serialErrorCode error, bool isCritical)

View File

@ -431,6 +431,7 @@ public class LoginController : MonoBehaviour
{ "Days",signForm.days},
};
avatar = Resources.Load<Texture>("Images/New Account");
transform.Find("Version").GetComponent<Text>().text = $"V{App.AppVersion}";
}
async void GetRotateImage()

View File

@ -56,6 +56,7 @@ public class MainController : MonoBehaviour
//UIManager.ShowUserInfoPanel();
//UIManager.ShowEditUserPanel();
//UIManager.ShowBigMapPanel();
//UIManager.ShowEarthPanel();
}
}

View File

@ -72,11 +72,20 @@ namespace Assets.Scripts.UI.Control
{
mOnValueChange(i);
}
SetWhite(i);
outline.enabled = false;
});
SetWhite(this.GetComponent<Dropdown>().value);
outline = transform.GetComponent<Outline>();
}
public void SetWhite(int index)
{
if (index != -1 && this.GetComponent<Dropdown>().interactable)
{
this.GetComponent<Dropdown>().captionText.color = Utils.HexToColorHtml("#ffffff");
}
}
public void SetValidate()
{
outline.enabled = true;
@ -136,7 +145,7 @@ namespace Assets.Scripts.UI.Control
public void OnPointerClick(PointerEventData eventData)
{
if (GetComponent<Dropdown>().value == -1) return;
if (GetComponent<Dropdown>().value == -1 || !GetComponent<Dropdown>().interactable) return;
var x = transform.Find("Dropdown List").GetComponent<ScrollRect>().content;
x.GetChild(SelectedIndex + 1).Find("Item Label").GetComponent<Text>().color = Utils.HexToColorHtml("#f93086");
}

View File

@ -65,6 +65,7 @@ namespace Assets.Scripts.UI.Control
if (!string.IsNullOrWhiteSpace(Tooltips))
{
//
//tooltips.GetComponent<RectTransform>().localPosition.
tooltips.transform.Find("Text").GetComponent<Text>().text = Tooltips;
}
tooltips.SetActive(false);

View File

@ -8,6 +8,7 @@ using UnityEngine.EventSystems;
using UnityEngine.UI;
using Assets.Scripts.Devices.Ant.Interfaces;
using Assets.Scripts.UI.Control;
using Assets.Scripts;
public class ConnectDeviceModal : PFUIPanel
{
@ -21,7 +22,17 @@ public class ConnectDeviceModal : PFUIPanel
{
Debug.Log(value);
mSensorType = value;
Logo.sprite = Resources.Load<Sprite>("Images/Devices/Trainer_3");
var deviceInfoStr = Utils.deviceDict[value.ToString()];
if (deviceInfoStr != null)
{
var deviceInfo = deviceInfoStr.Split('|');
if (deviceInfo.Length == 2)
{
Title.text = deviceInfo[0];
Logo.sprite = Resources.Load<Sprite>(deviceInfo[1]);
}
}
}
}
private Image Logo;
@ -29,7 +40,7 @@ public class ConnectDeviceModal : PFUIPanel
private VerticalLayoutGroup content;
private PfUIButton connectBtn;
private Dictionary<ushort, DeviceItem> deviceList;
private Text noDevice;
private Text noDevice,Title;
private RectTransform searchIconRect;
protected override void Awake()
@ -41,6 +52,7 @@ public class ConnectDeviceModal : PFUIPanel
var container = this.transform.Find("GameObject");
var closeBtn = container.Find("CloseBtn");
Logo = container.Find("Logo").GetComponent<Image>();
Title = container.Find("Title").GetComponent<Text>();
var panel = container.Find("Panel");
content = panel.Find("Scroll View").Find("Viewport").Find("Content").GetComponent<VerticalLayoutGroup>();

View File

@ -70,7 +70,7 @@ public class FeedbackController : PFUIPanel
{
if (App.CurrentUser == null) return;
main.Find("Email").Find("Value").Find("Text").GetComponent<Text>().text = App.CurrentUser.Phone;
main.Find("ID").Find("Value").Find("Text").GetComponent<Text>().text = App.CurrentUser.Id.ToString();
main.Find("ID").Find("Value").Find("Text").GetComponent<Text>().text = App.CurrentUser.Id.ToString("#000000");
main.Find("Version").Find("Value").Find("Text").GetComponent<Text>().text = App.AppVersion;
main.Find("Time").Find("Value").Find("Text").GetComponent<Text>().text = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
}

View File

@ -40,7 +40,7 @@ namespace Assets.Scripts.UI.Prefab.MapList
{"HC","750-99999" },
};
public static List<Dropdown.OptionData> sorts = new string[] {
"Distance","Name","Difficulty","Hot"//,"Times"
"Hot","Name","Distance","Difficulty"//,"Times"
}.Select(x => new Dropdown.OptionData(x)).ToList();
public static Dictionary<string, string> diffDisplayDict = new Dictionary<string, string>()
{

View File

@ -48,24 +48,34 @@ public class BigMapController : PFUIPanel
}
}
int timer = 0;
private RawImage maskImage;
protected override void Awake()
{
var cg = this.transform.Find("Canvas").GetComponent<CanvasGroup>();
cg.alpha = 0;
//var rect = Camera.main.rect;
//rect.position = new Vector2(0, 200);
Camera.main.transform.position = new Vector3(0, 200);
Camera.main.transform.rotation = Quaternion.Euler(90, 0, 0);
//var cg = this.transform.Find("Canvas").GetComponent<CanvasGroup>();
//cg.alpha = 0;
mapApi = new MapApi();
mapboxApi = new MapBoxApi();
begin = Resources.Load("UI/Prefab/BigMap/Begin");
StartCoroutine("Main");
}
IEnumerator Main()
{
mapManager = this.transform.Find("Map").GetComponent<AbstractMap>();
mapManager.MaxZoom = 4;
mapManager.OnInitialized += MapManager_OnInitialized;
mapManager.OnUpdated += MapManager_OnUpdated;
//// mapManager.OnTileFinished += MapManager_OnTileFinished;
//mapManager.SetZoom(13);
mapManager.SetZoom(7);
//mapManager.SetCenterLatitudeLongitude(new Mapbox.Utils.Vector2d(32.051203, 118.771572));
this.transform.Find("Map").GetComponent<QuadTreeCameraMovement>()._referenceCamera = Camera.main;
@ -84,7 +94,7 @@ public class BigMapController : PFUIPanel
});
var panel = canvas.transform.Find("Panel");
base.SetRounded(panel,30f);
base.SetRounded(panel, 30f);
content = panel.Find("Scroll View").Find("Viewport").Find("Content").gameObject;
var input = panel.Find("InputField");
@ -99,8 +109,11 @@ public class BigMapController : PFUIPanel
BindHeadImage();
maskImage = canvas.transform.Find("MaskImage").GetComponent<RawImage>();
maskImage.DOFade(0, 0.8f);
yield return null;
}
/// <summary>
/// 绑定头像
/// </summary>
@ -154,6 +167,19 @@ public class BigMapController : PFUIPanel
{
Debug.Log("update");
if(mapManager.Zoom <= 6)
{
mapManager.OnUpdated -= MapManager_OnUpdated;
maskImage.gameObject.SetActive(true);
maskImage.DOFade(1f, 0.9f).SetEase(Ease.InSine).OnComplete(() =>
{
this.Close();
UIManager.ShowEarthPanel(mapManager.CenterLatitudeLongitude.x, mapManager.CenterLatitudeLongitude.y);
});
return;
}
foreach (var item in linesCache)
{
//if(item.Value.LineObject != null)
@ -431,13 +457,24 @@ public class BigMapController : PFUIPanel
}
}
public override void Show()
public void Show(double lat, double lon)
{
var cg = this.transform.Find("Canvas").GetComponent<CanvasGroup>();
cg.alpha = 0;
//var cg = this.transform.Find("Canvas").GetComponent<CanvasGroup>();
//cg.alpha = 0;
var color = maskImage.color;
color.a = 1;
maskImage.color = color;
base.Show();
cg.DOFade(1f, 0.3f);
if(lat != 0 && lon != 0)
{
mapManager.SetCenterLatitudeLongitude(new Vector2d(lat, lon));
}
maskImage.DOFade(1f, 0.5f).OnComplete(()=> {
maskImage.gameObject.SetActive(false);
});
//cg.DOFade(1f, 0.3f);
}
public override void Close()
@ -487,7 +524,10 @@ public class BigMapController : PFUIPanel
//Debug.Log($"销毁{ item.Key }, { item.Value.Item != null }");
LineObject.Destroy();
BeginMarker.Destroy();
Item.gameObject.Destroy();
if (Item != null)
{
Item.gameObject.Destroy();
}
}
}
}

View File

@ -0,0 +1,232 @@
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
using WPM;
using DG.Tweening;
using UnityEngine.UI;
using Assets.Scripts.Apis;
using Newtonsoft.Json.Linq;
public class EarthController : PFUIPanel
{
private WorldMapGlobe map;
private Text Province;
private Text Country;
private RawImage maskImage;
private MapApi mapApi;
private Text CountText;
private Text OfficialText;
private Text RiderText;
private GameObject hotPanel;
private GameObject content;
private Object itemObject;
protected override void Awake()
{
base.Awake();
mapApi = new MapApi();
map = WorldMapGlobe.instance;
map.showProvinces = true;
map.showCities = true;
map.autoRotationSpeed = 0f;
//map.autoRotationSpeed = 0.1f;
//Camera.main.fieldOfView = 180;
map.SetZoomLevel(1.4f);
//map.allowUserZoom = false;
map.showLatitudeLines = false;
map.showLongitudeLines = false;
map.showCursor = false;
}
// Start is called before the first frame update
protected override void Start()
{
itemObject = Resources.Load("UI/Prefab/BigMap/Item");
var rootPanel = this.transform.Find("Canvas").Find("Panel");
var panel = rootPanel.Find("Panel");
SetRounded(panel, 60);
hotPanel = rootPanel.Find("HotPanel").gameObject;
SetRounded(hotPanel.transform, 60);
maskImage = rootPanel.Find("MaskImage").GetComponent<RawImage>();
Country = panel.Find("Country").GetComponent<Text>();
Province = panel.Find("Province").GetComponent<Text>();
CountText = panel.Find("CountPanel").Find("Count").GetComponent<Text>();
OfficialText = panel.Find("OfficialPanel").Find("Count").GetComponent<Text>();
RiderText = panel.Find("RiderPanel").Find("Count").GetComponent<Text>();
content = hotPanel.transform.Find("Scroll View").Find("Viewport").Find("Content").gameObject;
//map.SetZoomLevel(10);
//var mainCanvas = GameObject.Find("Canvas");
//mainCanvas.gameObject.SetActive(false);
UIManager.Instance.MainPanel.gameObject.SetActive(false);
Camera.main.transform.position = new Vector3(0, 0);
Camera.main.transform.rotation = Quaternion.Euler(0, 0, 0);
var zoom = map.GetZoomLevel();
map.OnZoomStart += Map_OnZoomStart;
map.OnZoomEnd += Map_OnZoomEnd;
map.OnClick += Map_OnClick;
map.OnCountryEnter += (int countryIndex, int regionIndex) =>
{
var country = map.countries[countryIndex];
if (country.name.ToLower().Contains("taiwan"))
{
Country.text = "China";
Province.text = "TaiWan";
ShowSummary(country.latlonCenter);
}
else {
Country.text = country.name;
}
};
map.OnCountryClick += (int countryIndex, int regionIndex) =>
{
var country = map.countries[countryIndex];
if (country.name.ToLower().Contains("taiwan"))
{
var latLon = country.latlonCenter;
EnterBigMap(latLon);
}
};
map.OnProvinceEnter += async (int provinceIndex, int regionIndex) =>
{
var province = map.provinces[provinceIndex];
Province.text = province.name;
ShowSummary(province.latlonCenter);
};
map.OnProvinceExit += (int provinceIndex, int regionIndex) =>
{
};
map.OnProvinceClick += (int provinceIndex, int regionIndex) =>
{
var province = map.provinces[provinceIndex];
var latLon = province.latlonCenter;
EnterBigMap(latLon);
};
}
/// <summary>
/// 显示概要信息
/// </summary>
/// <param name="latlonCenter"></param>
private async void ShowSummary(Vector2 latlonCenter)
{
var result = await mapApi.GetEarthData(latlonCenter.x, latlonCenter.y);
if (result.result == false)
{
return;
}
var obj = JObject.FromObject(result.data);
CountText.text = obj.Value<string>("count");
OfficialText.text = obj.Value<string>("officialCount");
RiderText.text = obj.Value<string>("riderCount");
//for (int i = 0; i < content.transform.childCount; i++)
//{
// DestroyImmediate(content.transform.GetChild(i));
//}
foreach (Transform item in content.transform)
{
GameObject.Destroy(item.gameObject);
}
var list = JArray.FromObject(obj["list"]);
foreach (var item in list)
{
var itemObject1 = (GameObject)Instantiate(itemObject, content.transform, false);
var iii = itemObject1.GetComponent<Item>();
iii.SetModel(new Assets.Scripts.Apis.Models.NearRouteModel
{
Id = item.Value<int>("Id"),
Name = item.Value<string>("Name"),
TheHeat = item.Value<int>("TheHat"),
IsFire = item.Value<bool>("IsFire")
});
}
}
/// <summary>
/// 进入大地图
/// </summary>
/// <param name="latLon"></param>
private void EnterBigMap(Vector2 latLon)
{
map.FlyToLocation(latLon.x, latLon.y, 1f, 0.1f).Then(() => {
//Close();
//UIManager.ShowBigMapPanel();
});
maskImage.gameObject.SetActive(true);
maskImage.DOFade(1f, 0.9f).SetEase(Ease.InSine).OnComplete(() => {
Close();
UIManager.ShowBigMapPanel(latLon.x, latLon.y);
});
}
private void Map_OnClick(Vector3 sphereLocation, int mouseButtonIndex)
{
Debug.Log("click");
Vector2 latLon = Conversion.GetLatLonFromSpherePoint(sphereLocation);
Debug.Log("Clicked on Latitude: " + latLon.x + ", Longitude: " + latLon.y);
}
private void Map_OnZoomStart(float zoomLevel)
{
//throw new System.NotImplementedException();
Debug.Log(zoomLevel);
}
private void Map_OnZoomEnd(float zoomLevel)
{
Debug.Log(zoomLevel);
}
// Update is called once per frame
void Update()
{
//var zoom = map.GetZoomLevel();
//Debug.Log(zoom);
}
public void Show(double lat, double lon)
{
if (lat != 0 && lon != 0)
{
map.FlyToLocation(new Vector2((float)lat, (float)lon), 0.1f);
}
}
public override void Close()
{
//base.Close();
DestroyImmediate(this.gameObject);
}
}

View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 219017a4cf0dd2d4b8118d5723644209
guid: ad7c4b0fd31e47d40858215e0bd78fb8
MonoImporter:
externalObjects: {}
serializedVersion: 2

View File

@ -205,7 +205,7 @@ public class EditUserController : PFUIPanel
mMonthDropdown.SelectValue(birthday.Month.ToString());
mDayDropdown.SelectValue(birthday.Day.ToString());
}
mID.text = currentUser.Id.ToString();
mID.text = currentUser.Id.ToString("000000");
mNickName.Text = currentUser.Nickname;
mFTP.Text = currentUser.FTP.ToString();
mWeight.Text = currentUser.Weight.ToString();
@ -324,7 +324,8 @@ public class EditUserController : PFUIPanel
userinfos[i].NickName = user.Nickname;
UIManager.Instance.userInfos = userinfos;
}
UIManager.ShowAlert("Success");
Utils.showToast(gameObject, "Success", type: 1);
//UIManager.ShowAlert("Success");
}
LoadDataSync();
//App.CurrentUser = user;
@ -346,11 +347,13 @@ public class EditUserController : PFUIPanel
UIManager.Instance.userInfos = userinfos;
}
App.CurrentUser.WxHeadImg = img;
UIManager.ShowAlert("Success");
Utils.showToast(gameObject, "Success", type: 1);
//UIManager.ShowAlert();
}
else
{
UIManager.ShowAlert(r.errMsg);
Utils.showToast(gameObject, r.errMsg);
//UIManager.ShowAlert();
}
}
void Cancel(BaseEventData e)

View File

@ -54,7 +54,8 @@ public class MapListController : PFUIPanel
UIManager.AddEvent(btnMapMode.transform.Find("GoList").gameObject, EventTriggerType.PointerClick, (e) =>
{
UIManager.PopStack();
UIManager.ShowBigMapPanel();
//UIManager.ShowBigMapPanel();
UIManager.ShowEarthPanel(App.latitude, App.longitude);
});
if (content!=null)
{
@ -169,7 +170,7 @@ public class MapListController : PFUIPanel
{
var drop = sorts.GetComponent<Dropdown>();
drop.options = MapFilterOptions.sorts;
drop.value = 3;
drop.value = 0;
drop.onValueChanged.AddListener((int index)=>
{
sort = drop.options[index].text;

View File

@ -84,7 +84,10 @@ public class UserInfoController : PFUIPanel
infoPanel.Find("Weight").Find("Value").GetComponent<Text>().text = $"{user.Weight}KG";
infoPanel.Find("BW").Find("Value").GetComponent<Text>().text = $"{user.BicycleWeight}KG";
infoPanel.Find("WD").Find("Value").GetComponent<Text>().text = $"{user.WheelDiameter}MM";
if (user.Sex == 2)
{
infoPanel.Find("SexIcon").GetComponent<Image>().sprite = Resources.Load<Sprite>("Images/woman");
}
summaryPanel.Find("Number").Find("Value").GetComponent<Text>().text = summary.Count.ToString();
summaryPanel.Find("Time").Find("Value").GetComponent<Text>().text = summary.TotalTicks.ToString();
summaryPanel.Find("KM").Find("Value").GetComponent<Text>().text = summary.TotalDistance.ToString();

View File

@ -36,7 +36,7 @@ public class RouteItem : MonoBehaviour, IPointerExitHandler, IPointerEnterHandle
row2 = left.Find("Main").Find("Row2");
Utils.DisplayImage(StartCoroutine, transform.Find("CoverImage").GetComponent<RawImage>(), result.RouteImage);
left.Find("Main").Find("Name").GetComponent<Text>().text = result.RouteName;
left.Find("Main").Find("Time").GetComponent<Text>().text = result.CreateTime.ToString("yyyy-MM-dd HH-mm-ss");
left.Find("Main").Find("Time").GetComponent<Text>().text = result.CreateTime.ToString("yyyy-MM-dd HH:mm:ss");
row1.Find("Time").GetComponent<Text>().text = $"<color={titleColor}>Riding time:</color>{result.TrainingTime}";
row1.Find("Distance").GetComponent<Text>().text = $"<color={titleColor}>Mileage:</color>{result.EndDistance.ToString("#0.00")}KM";
row1.Find("Times").GetComponent<Text>().text = $"<color={titleColor}>Times:</color>{result.Count}";

View File

@ -394,17 +394,33 @@ public class UIManager : MonoBehaviour
// UIManager.Show(prePanel, UIManager.Instance.MainPanel);
//}
}
public static void ShowBigMapPanel()
public static void ShowBigMapPanel(double lat = 0, double lon = 0)
{
UIManager.Instance.MainPanel.gameObject.SetActive(false);
var obj = Resources.Load("UI/Prefab/Panel/BigMapPanel");
//var root = UIManager.Instance.MainPanel.transform.parent.parent;
var bigMap = (GameObject)Instantiate(obj, UIManager.Instance.Root.transform);
bigMap.GetComponent<BigMapController>().Show();
bigMap.GetComponent<BigMapController>().Show(lat, lon);
stack.Push(bigMap.GetComponent<PFUIPanel>());
//prePanel = bigMap.GetComponent<PFUIPanel>();
}
static GameObject earthPanel = null;
public static void ShowEarthPanel(double lat = 0, double lon = 0)
{
if (UIManager.Instance.MainPanel != null)
{
UIManager.Instance.MainPanel.gameObject.SetActive(false);
}
if (earthPanel == null)
{
var obj = Resources.Load("UI/Prefab/Panel/EarthPanel");
//var root = UIManager.Instance.MainPanel.transform.parent.parent;
earthPanel = (GameObject)Instantiate(obj, UIManager.Instance.Root.transform);
}
earthPanel.GetComponent<EarthController>().Show(lat, lon);
}
static Texture2D cursor;
public static void RemoveEvent(GameObject gameObject)
{

View File

@ -97,19 +97,43 @@ namespace Assets.Scripts
_toastDict = value;
}
}
private static Dictionary<string, string> _deviceDict;
public static Dictionary<string, string> deviceDict
{
get
{
if (_deviceDict == null)
{
_deviceDict = new Dictionary<string, string>
{
{"Trainer","Smart Trainer|Images/Devices/Trainer_3" },
{"Power","Power Meter|Images/Devices/Power_3" },
{"Cadence","Cadence Sensor|Images/Devices/Cadence_3" },
{"HeartRate","Heart Rate Monitor|Images/Devices/Heart Rate_3" },
{"SpeedCadence","Speed Meter|Images/Devices/Speed_3" },
};
}
return _deviceDict;
}
private set
{
_deviceDict = value;
}
}
public static void showToast(GameObject game,string text,int duration = 1,int type = 0)
{
//type 0错误 1正确
var parent = Utils.FindUpParent(game.transform);
var toast = parent.Find("ToastContainer");
if (toast == null)
if (toast != null)
{
var newToast = MonoBehaviour.Instantiate(Resources.Load<GameObject>("UI/Prefab/ToastContainer"));
newToast.name = "ToastContainer";
newToast.GetComponent<RectTransform>().position = new Vector3(Screen.width / 2, Screen.height / 2, 0);
newToast.transform.parent = parent;
toast = newToast.transform;
MonoBehaviour.DestroyImmediate(toast.gameObject);
}
var newToast = MonoBehaviour.Instantiate(Resources.Load<GameObject>("UI/Prefab/ToastContainer"));
newToast.name = "ToastContainer";
newToast.GetComponent<RectTransform>().position = new Vector3(Screen.width / 2, Screen.height / 2, 0);
newToast.transform.parent = parent;
toast = newToast.transform;
var toastStyle = toastDict[type].Split('|');
toast.Find("Image").GetComponent<Image>().sprite = Resources.Load<Sprite>(toastStyle[0]);
toast.GetComponent<Image>().color = HexToColorHtml(toastStyle[1]);