Merge remote-tracking branch 'origin/dev_mobile' into dev_mobile_ble
This commit is contained in:
commit
ca51e06d37
63
Assets/ContentFitterController.cs
Normal file
63
Assets/ContentFitterController.cs
Normal file
@ -0,0 +1,63 @@
|
||||
using System.Collections;
|
||||
using System.Collections.Generic;
|
||||
using UnityEngine;
|
||||
using UnityEngine.UI;
|
||||
|
||||
public class ContentFitterController : MonoBehaviour
|
||||
{
|
||||
// Start is called before the first frame update
|
||||
void Start()
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
// Update is called once per frame
|
||||
void Update()
|
||||
{
|
||||
|
||||
}
|
||||
public void Refresh()
|
||||
{
|
||||
LayoutRebuilder.ForceRebuildLayoutImmediate(transform.GetComponent<RectTransform>());
|
||||
//Canvas.ForceUpdateCanvases();
|
||||
//HorizontalOrVerticalLayoutGroup layout = GetComponent<HorizontalLayoutGroup>();
|
||||
//if (layout)
|
||||
//{
|
||||
// UpdateRect(layout);
|
||||
//}
|
||||
//else
|
||||
//{
|
||||
// layout = GetComponent<VerticalLayoutGroup>();
|
||||
// if (layout)
|
||||
// {
|
||||
// UpdateRect(layout);
|
||||
// }
|
||||
//}
|
||||
}
|
||||
private void OnRectTransformDimensionsChange()
|
||||
{
|
||||
Debug.Log("cf刷新一次2");
|
||||
Refresh();
|
||||
}
|
||||
private IEnumerator UpdateRect()
|
||||
{
|
||||
LayoutRebuilder.ForceRebuildLayoutImmediate(transform.GetComponent<RectTransform>());
|
||||
yield return new WaitForSeconds(0.1F);
|
||||
var round = GetComponent<ImageWithIndependentRoundedCorners>();
|
||||
if (round)
|
||||
{
|
||||
round.Refresh();
|
||||
}
|
||||
}
|
||||
public void UpdateRect(HorizontalOrVerticalLayoutGroup layout)
|
||||
{
|
||||
if (layout is HorizontalLayoutGroup)
|
||||
{
|
||||
layout.SetLayoutHorizontal();
|
||||
}
|
||||
if (layout is VerticalLayoutGroup)
|
||||
{
|
||||
layout.SetLayoutVertical();
|
||||
}
|
||||
}
|
||||
}
|
||||
11
Assets/ContentFitterController.cs.meta
Normal file
11
Assets/ContentFitterController.cs.meta
Normal file
@ -0,0 +1,11 @@
|
||||
fileFormatVersion: 2
|
||||
guid: d832f1dc5650bd24b90dbd3efdc2780e
|
||||
MonoImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 2
|
||||
defaultReferences: []
|
||||
executionOrder: 0
|
||||
icon: {instanceID: 0}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
@ -1,6 +1,6 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<manifest xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools">
|
||||
<application>
|
||||
<application android:requestLegacyExternalStorage="true">
|
||||
<activity android:name="com.unityplugins.imageselector.TestMainActivity" android:theme="@style/UnityThemeSelector" android:screenOrientation="landscape" android:launchMode="singleTask" android:configChanges="mcc|mnc|locale|touchscreen|keyboard|keyboardHidden|navigation|orientation|screenLayout|uiMode|screenSize|smallestScreenSize|fontScale|layoutDirection|density" android:hardwareAccelerated="false">
|
||||
<intent-filter>
|
||||
<action android:name="android.intent.action.MAIN" />
|
||||
@ -21,7 +21,8 @@
|
||||
android:name="android.support.v4.content.FileProvider"
|
||||
android:authorities="${applicationId}.any_provider"
|
||||
android:grantUriPermissions="true"
|
||||
android:exported="false">
|
||||
android:exported="false"
|
||||
tools:replace="android:authorities">
|
||||
<meta-data
|
||||
android:name="android.support.FILE_PROVIDER_PATHS"
|
||||
android:resource="@xml/provider_paths" />
|
||||
|
||||
BIN
Assets/Plugins/Android/ImageSelector-release.aar
Normal file
BIN
Assets/Plugins/Android/ImageSelector-release.aar
Normal file
Binary file not shown.
@ -1,5 +1,5 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 6ea86a8936b718949b5501d873739db1
|
||||
guid: 9722f205596f2fd499991ea299119cc8
|
||||
PluginImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 2
|
||||
Binary file not shown.
@ -12,6 +12,7 @@ dependencies {
|
||||
implementation(name: 'libcore-release', ext:'aar')
|
||||
implementation(name: 'libtelemetry-full-release', ext:'aar')
|
||||
implementation(name: 'UnityCallWechatShare-release', ext:'aar')
|
||||
implementation files ('libs/ImageSelector-release.aar')
|
||||
}
|
||||
|
||||
android {
|
||||
|
||||
@ -1,5 +1,7 @@
|
||||
//import 引用头文件 相当于Using
|
||||
#import<QuartzCore/CADisplayLink.h>
|
||||
//声明一个IOSCameraController类 继承自UIViewController <>里面是是协议/代理的调用声明 可以理解为c#的接口
|
||||
@interface IOSCameraController : UIViewController<UIImagePickerControllerDelegate,UINavigationControllerDelegate>
|
||||
@interface IOSCameraController : UIViewController<UIImagePickerControllerDelegate,UINavigationControllerDelegate>{
|
||||
@public NSString * pageName;
|
||||
}
|
||||
@end
|
||||
@ -76,7 +76,7 @@
|
||||
[data writeToFile:path atomically:YES];
|
||||
//保存之后通知unity 执行对应的回调
|
||||
//UnitySendMessage 是用来给unity发消息的 有三个参数 1.挂载对应回调脚本的物体名 2.回调函数的名称 3.对应回调上的参数
|
||||
UnitySendMessage("FeedbackModal(Clone)", "OnMobileImageSelect", [NSString stringWithFormat:@"true,%@",path ].UTF8String);
|
||||
UnitySendMessage(pageName.UTF8String, "OnMobileImageSelect", [NSString stringWithFormat:@"true,%@",path ].UTF8String);
|
||||
}
|
||||
#pragma mark 图片处理方法
|
||||
//图片旋转处理
|
||||
@ -156,14 +156,16 @@
|
||||
extern "C" {
|
||||
#endif
|
||||
//导出接口供unity使用
|
||||
void IOS_OpenCamera(){
|
||||
void IOS_OpenCamera(const char * pageName){
|
||||
IOSCameraController *app = [[IOSCameraController alloc]init];
|
||||
app->pageName = [NSString stringWithUTF8String:pageName];
|
||||
UIViewController *vc = UnityGetGLViewController();
|
||||
[vc.view addSubview:app.view];
|
||||
[app OpenTarget:UIImagePickerControllerSourceTypeCamera];
|
||||
}
|
||||
void IOS_OpenAlbum(){
|
||||
void IOS_OpenAlbum(const char * pageName){
|
||||
IOSCameraController *app = [[IOSCameraController alloc]init];
|
||||
app->pageName = [NSString stringWithUTF8String:pageName];
|
||||
UIViewController *vc = UnityGetGLViewController();
|
||||
[vc.view addSubview:app.view];
|
||||
[app OpenTarget:UIImagePickerControllerSourceTypePhotoLibrary];
|
||||
|
||||
@ -88,16 +88,17 @@ void OpenWXApp()
|
||||
[WXApi openWXApp];
|
||||
}
|
||||
|
||||
bool checkAPPIsExist(NSString* URLScheme)
|
||||
bool checkAPPIsExist(const char * URLScheme)
|
||||
{
|
||||
NSURL* url;
|
||||
if ([URLScheme containsString:@"://"])
|
||||
NSString * urls = [NSString stringWithUTF8String:URLScheme];
|
||||
if ([urls containsString:@"://"])
|
||||
{
|
||||
url = [NSURL URLWithString:[NSString stringWithFormat:@"%@",URLScheme]];
|
||||
url = [NSURL URLWithString:[NSString stringWithFormat:@"%@",urls]];
|
||||
}
|
||||
else
|
||||
{
|
||||
url = [NSURL URLWithString:[NSString stringWithFormat:@"%@://",URLScheme]];
|
||||
url = [NSURL URLWithString:[NSString stringWithFormat:@"%@://",urls]];
|
||||
}
|
||||
if([[UIApplication sharedApplication] canOpenURL:url])
|
||||
{
|
||||
|
||||
BIN
Assets/Resources/Images/Mobile/shadow.png
Normal file
BIN
Assets/Resources/Images/Mobile/shadow.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 10 KiB |
128
Assets/Resources/Images/Mobile/shadow.png.meta
Normal file
128
Assets/Resources/Images/Mobile/shadow.png.meta
Normal file
@ -0,0 +1,128 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 44eed58611fb526488c3664504b4a0a1
|
||||
TextureImporter:
|
||||
internalIDToNameTable: []
|
||||
externalObjects: {}
|
||||
serializedVersion: 11
|
||||
mipmaps:
|
||||
mipMapMode: 0
|
||||
enableMipMap: 0
|
||||
sRGBTexture: 1
|
||||
linearTexture: 0
|
||||
fadeOut: 0
|
||||
borderMipMap: 0
|
||||
mipMapsPreserveCoverage: 0
|
||||
alphaTestReferenceValue: 0.5
|
||||
mipMapFadeDistanceStart: 1
|
||||
mipMapFadeDistanceEnd: 3
|
||||
bumpmap:
|
||||
convertToNormalMap: 0
|
||||
externalNormalMap: 0
|
||||
heightScale: 0.25
|
||||
normalMapFilter: 0
|
||||
isReadable: 0
|
||||
streamingMipmaps: 0
|
||||
streamingMipmapsPriority: 0
|
||||
grayScaleToAlpha: 0
|
||||
generateCubemap: 6
|
||||
cubemapConvolution: 0
|
||||
seamlessCubemap: 0
|
||||
textureFormat: 1
|
||||
maxTextureSize: 2048
|
||||
textureSettings:
|
||||
serializedVersion: 2
|
||||
filterMode: -1
|
||||
aniso: -1
|
||||
mipBias: -100
|
||||
wrapU: 1
|
||||
wrapV: 1
|
||||
wrapW: -1
|
||||
nPOTScale: 0
|
||||
lightmap: 0
|
||||
compressionQuality: 50
|
||||
spriteMode: 1
|
||||
spriteExtrude: 1
|
||||
spriteMeshType: 1
|
||||
alignment: 0
|
||||
spritePivot: {x: 0.5, y: 0.5}
|
||||
spritePixelsToUnits: 100
|
||||
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
|
||||
spriteGenerateFallbackPhysicsShape: 1
|
||||
alphaUsage: 1
|
||||
alphaIsTransparency: 1
|
||||
spriteTessellationDetail: -1
|
||||
textureType: 8
|
||||
textureShape: 1
|
||||
singleChannelComponent: 0
|
||||
maxTextureSizeSet: 0
|
||||
compressionQualitySet: 0
|
||||
textureFormatSet: 0
|
||||
applyGammaDecoding: 0
|
||||
platformSettings:
|
||||
- serializedVersion: 3
|
||||
buildTarget: DefaultTexturePlatform
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: -1
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 0
|
||||
androidETC2FallbackOverride: 0
|
||||
forceMaximumCompressionQuality_BC6H_BC7: 0
|
||||
- serializedVersion: 3
|
||||
buildTarget: Standalone
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: -1
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 0
|
||||
androidETC2FallbackOverride: 0
|
||||
forceMaximumCompressionQuality_BC6H_BC7: 0
|
||||
- serializedVersion: 3
|
||||
buildTarget: iPhone
|
||||
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:
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 363 B After Width: | Height: | Size: 735 B |
@ -46,7 +46,7 @@ TextureImporter:
|
||||
alignment: 0
|
||||
spritePivot: {x: 0.5, y: 0.5}
|
||||
spritePixelsToUnits: 100
|
||||
spriteBorder: {x: 10, y: 10, z: 10, w: 10}
|
||||
spriteBorder: {x: 20, y: 0, z: 20, w: 0}
|
||||
spriteGenerateFallbackPhysicsShape: 1
|
||||
alphaUsage: 1
|
||||
alphaIsTransparency: 1
|
||||
|
||||
@ -5285,7 +5285,7 @@ PrefabInstance:
|
||||
- target: {fileID: 545917028276686471, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
|
||||
type: 3}
|
||||
propertyPath: m_SizeDelta.x
|
||||
value: 40
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1123028309966834811, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
|
||||
type: 3}
|
||||
@ -5375,12 +5375,12 @@ PrefabInstance:
|
||||
- target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
|
||||
type: 3}
|
||||
propertyPath: m_AnchoredPosition.x
|
||||
value: 148
|
||||
value: 50
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
|
||||
type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: -364
|
||||
value: -146
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
|
||||
type: 3}
|
||||
@ -5405,7 +5405,7 @@ PrefabInstance:
|
||||
- target: {fileID: 3150550772099312289, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
|
||||
type: 3}
|
||||
propertyPath: m_IsActive
|
||||
value: 0
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3150550772916003707, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
|
||||
type: 3}
|
||||
@ -5415,22 +5415,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}
|
||||
|
||||
@ -38,7 +38,7 @@ RectTransform:
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 1, y: 1}
|
||||
m_AnchoredPosition: {x: 3, y: -10}
|
||||
m_SizeDelta: {x: -14, y: -20}
|
||||
m_SizeDelta: {x: -14, y: -10}
|
||||
m_Pivot: {x: 0.5, y: 1}
|
||||
--- !u!222 &465239218947862514
|
||||
CanvasRenderer:
|
||||
@ -1560,7 +1560,7 @@ MonoBehaviour:
|
||||
m_SelectedTrigger: Selected
|
||||
m_DisabledTrigger: Disabled
|
||||
m_Interactable: 1
|
||||
m_TargetGraphic: {fileID: 0}
|
||||
m_TargetGraphic: {fileID: 6531176937881363210}
|
||||
m_OnClick:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
|
||||
@ -30,6 +30,7 @@ RectTransform:
|
||||
m_Children:
|
||||
- {fileID: 300991727349330169}
|
||||
- {fileID: 5238700825434142442}
|
||||
- {fileID: 3249953945569601876}
|
||||
m_Father: {fileID: 300991727591432256}
|
||||
m_RootOrder: 1
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
@ -1631,7 +1632,7 @@ RectTransform:
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: -210, y: -199}
|
||||
m_AnchoredPosition: {x: -210, y: -205}
|
||||
m_SizeDelta: {x: 190, y: 90}
|
||||
m_Pivot: {x: 0, y: 1}
|
||||
--- !u!222 &5238700826149900199
|
||||
@ -2638,6 +2639,9 @@ GameObject:
|
||||
- component: {fileID: 7041032684697079492}
|
||||
- component: {fileID: 4525673257888556191}
|
||||
- component: {fileID: 514663802465645756}
|
||||
- component: {fileID: 3928515986859718043}
|
||||
- component: {fileID: 7663415347928336954}
|
||||
- component: {fileID: 3048864467902794139}
|
||||
m_Layer: 5
|
||||
m_Name: Status
|
||||
m_TagString: Untagged
|
||||
@ -2692,7 +2696,7 @@ MonoBehaviour:
|
||||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_Texture: {fileID: 2800000, guid: 4214119458c589c409b03681f25e73d8, type: 3}
|
||||
m_Texture: {fileID: 0}
|
||||
m_UVRect:
|
||||
serializedVersion: 2
|
||||
x: 0
|
||||
@ -2738,6 +2742,44 @@ MonoBehaviour:
|
||||
m_EditorClassIdentifier:
|
||||
m_HorizontalFit: 2
|
||||
m_VerticalFit: 0
|
||||
--- !u!114 &3928515986859718043
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 7244434384299247192}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 109c41f08973846429af681aea0a30c4, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
r: {x: 0, y: 10, z: 0, w: 10}
|
||||
rect2props: {x: 0.00000023841858, y: -0.0000011920929, z: 10.606603, w: 3.5355341}
|
||||
--- !u!225 &7663415347928336954
|
||||
CanvasGroup:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 7244434384299247192}
|
||||
m_Enabled: 1
|
||||
m_Alpha: 1
|
||||
m_Interactable: 1
|
||||
m_BlocksRaycasts: 1
|
||||
m_IgnoreParentGroups: 0
|
||||
--- !u!114 &3048864467902794139
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 7244434384299247192}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: d832f1dc5650bd24b90dbd3efdc2780e, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
--- !u!1 &7610353052895165859
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -2816,6 +2858,80 @@ MonoBehaviour:
|
||||
m_VerticalOverflow: 0
|
||||
m_LineSpacing: 1
|
||||
m_Text: Rice Start Time
|
||||
--- !u!1 &8614637095372919876
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 3249953945569601876}
|
||||
- component: {fileID: 7144964455133811269}
|
||||
- component: {fileID: 383421175324865264}
|
||||
m_Layer: 5
|
||||
m_Name: Shadow
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &3249953945569601876
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 8614637095372919876}
|
||||
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: 300991727036703949}
|
||||
m_RootOrder: 2
|
||||
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: -10}
|
||||
m_SizeDelta: {x: 0, y: -305}
|
||||
m_Pivot: {x: 0.5, y: 0}
|
||||
--- !u!222 &7144964455133811269
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 8614637095372919876}
|
||||
m_CullTransparentMesh: 0
|
||||
--- !u!114 &383421175324865264
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 8614637095372919876}
|
||||
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: 44eed58611fb526488c3664504b4a0a1, 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 &8848845176364978951
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
||||
@ -129,13 +129,14 @@ GameObject:
|
||||
- component: {fileID: 2547147171398365227}
|
||||
- component: {fileID: 6950270674676521777}
|
||||
- component: {fileID: 2962819245497661191}
|
||||
- component: {fileID: 4582195961826941797}
|
||||
m_Layer: 5
|
||||
m_Name: gq
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &2547147171398365227
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -176,7 +177,7 @@ MonoBehaviour:
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Material: {fileID: 0}
|
||||
m_Color: {r: 1, g: 1, b: 1, a: 1}
|
||||
m_Color: {r: 0.13725491, g: 0.13725491, b: 0.1764706, a: 1}
|
||||
m_RaycastTarget: 1
|
||||
m_Maskable: 1
|
||||
m_OnCullStateChanged:
|
||||
@ -189,6 +190,19 @@ MonoBehaviour:
|
||||
y: 0
|
||||
width: 1
|
||||
height: 1
|
||||
--- !u!114 &4582195961826941797
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1703012134833883404}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: adb30198aa32dd140b5750692dd48104, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
radius: 26
|
||||
--- !u!1 &2322805962556808324
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -1799,7 +1813,7 @@ MonoBehaviour:
|
||||
m_Bottom: 10
|
||||
m_ChildAlignment: 0
|
||||
m_StartCorner: 0
|
||||
m_StartAxis: 1
|
||||
m_StartAxis: 0
|
||||
m_CellSize: {x: 158, y: 170}
|
||||
m_Spacing: {x: 10, y: 10}
|
||||
m_Constraint: 0
|
||||
@ -1913,12 +1927,12 @@ PrefabInstance:
|
||||
- target: {fileID: 2054923810110871857, guid: a1999d0576fee6248a9c5a507ae8d10e,
|
||||
type: 3}
|
||||
propertyPath: m_AnchorMax.y
|
||||
value: 1
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2054923810110871857, guid: a1999d0576fee6248a9c5a507ae8d10e,
|
||||
type: 3}
|
||||
propertyPath: m_AnchorMin.y
|
||||
value: 1
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2054923810110871857, guid: a1999d0576fee6248a9c5a507ae8d10e,
|
||||
type: 3}
|
||||
@ -1928,7 +1942,7 @@ PrefabInstance:
|
||||
- target: {fileID: 2054923810110871857, guid: a1999d0576fee6248a9c5a507ae8d10e,
|
||||
type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: -9
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2638424933752433026, guid: a1999d0576fee6248a9c5a507ae8d10e,
|
||||
type: 3}
|
||||
@ -2098,12 +2112,12 @@ PrefabInstance:
|
||||
- target: {fileID: 6347209353323850145, guid: a1999d0576fee6248a9c5a507ae8d10e,
|
||||
type: 3}
|
||||
propertyPath: m_AnchorMax.y
|
||||
value: 1
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6347209353323850145, guid: a1999d0576fee6248a9c5a507ae8d10e,
|
||||
type: 3}
|
||||
propertyPath: m_AnchorMin.y
|
||||
value: 1
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6347209353323850145, guid: a1999d0576fee6248a9c5a507ae8d10e,
|
||||
type: 3}
|
||||
@ -2113,7 +2127,7 @@ PrefabInstance:
|
||||
- target: {fileID: 6347209353323850145, guid: a1999d0576fee6248a9c5a507ae8d10e,
|
||||
type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: -9
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6731556475519980336, guid: a1999d0576fee6248a9c5a507ae8d10e,
|
||||
type: 3}
|
||||
@ -2168,12 +2182,12 @@ PrefabInstance:
|
||||
- target: {fileID: 8197454007437855745, guid: a1999d0576fee6248a9c5a507ae8d10e,
|
||||
type: 3}
|
||||
propertyPath: m_AnchorMax.y
|
||||
value: 1
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8197454007437855745, guid: a1999d0576fee6248a9c5a507ae8d10e,
|
||||
type: 3}
|
||||
propertyPath: m_AnchorMin.y
|
||||
value: 1
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8197454007437855745, guid: a1999d0576fee6248a9c5a507ae8d10e,
|
||||
type: 3}
|
||||
@ -2183,17 +2197,17 @@ PrefabInstance:
|
||||
- target: {fileID: 8197454007437855745, guid: a1999d0576fee6248a9c5a507ae8d10e,
|
||||
type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: -9
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8526344065104504758, guid: a1999d0576fee6248a9c5a507ae8d10e,
|
||||
type: 3}
|
||||
propertyPath: m_AnchorMax.y
|
||||
value: 1
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8526344065104504758, guid: a1999d0576fee6248a9c5a507ae8d10e,
|
||||
type: 3}
|
||||
propertyPath: m_AnchorMin.y
|
||||
value: 1
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8526344065104504758, guid: a1999d0576fee6248a9c5a507ae8d10e,
|
||||
type: 3}
|
||||
@ -2203,7 +2217,7 @@ PrefabInstance:
|
||||
- target: {fileID: 8526344065104504758, guid: a1999d0576fee6248a9c5a507ae8d10e,
|
||||
type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: -2
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 9135822971364406318, guid: a1999d0576fee6248a9c5a507ae8d10e,
|
||||
type: 3}
|
||||
@ -2238,15 +2252,15 @@ PrefabInstance:
|
||||
m_RemovedComponents:
|
||||
- {fileID: 829206726517620079, guid: a1999d0576fee6248a9c5a507ae8d10e, type: 3}
|
||||
m_SourcePrefab: {fileID: 100100000, guid: a1999d0576fee6248a9c5a507ae8d10e, type: 3}
|
||||
--- !u!1 &8089048072454713058 stripped
|
||||
GameObject:
|
||||
m_CorrespondingSourceObject: {fileID: 2638424933752433026, guid: a1999d0576fee6248a9c5a507ae8d10e,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 6115751004523743072}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!224 &8089048072454713059 stripped
|
||||
RectTransform:
|
||||
m_CorrespondingSourceObject: {fileID: 2638424933752433027, guid: a1999d0576fee6248a9c5a507ae8d10e,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 6115751004523743072}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!1 &8089048072454713058 stripped
|
||||
GameObject:
|
||||
m_CorrespondingSourceObject: {fileID: 2638424933752433026, guid: a1999d0576fee6248a9c5a507ae8d10e,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 6115751004523743072}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
||||
@ -38,7 +38,7 @@ RectTransform:
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 0, y: 0}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 58, y: 40}
|
||||
m_SizeDelta: {x: 0, y: 0}
|
||||
m_Pivot: {x: 0, y: 1}
|
||||
--- !u!222 &9190192381015952294
|
||||
CanvasRenderer:
|
||||
@ -297,6 +297,8 @@ GameObject:
|
||||
- component: {fileID: 3267393459555052240}
|
||||
- component: {fileID: 5794960625977906479}
|
||||
- component: {fileID: 1374767431251357481}
|
||||
- component: {fileID: 3003052478643551334}
|
||||
- component: {fileID: 8129408236558198033}
|
||||
m_Layer: 5
|
||||
m_Name: SwitchMode
|
||||
m_TagString: Untagged
|
||||
@ -314,14 +316,16 @@ RectTransform:
|
||||
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_Children:
|
||||
- {fileID: 7825229638776794366}
|
||||
- {fileID: 7285418945995382289}
|
||||
m_Father: {fileID: 1673965681348374004}
|
||||
m_RootOrder: 4
|
||||
m_RootOrder: 3
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0.5}
|
||||
m_AnchorMax: {x: 0, y: 0.5}
|
||||
m_AnchoredPosition: {x: 30, y: 56}
|
||||
m_SizeDelta: {x: 52, y: 52}
|
||||
m_SizeDelta: {x: 52, y: 0}
|
||||
m_Pivot: {x: 0, y: 1}
|
||||
--- !u!222 &3267393459555052240
|
||||
CanvasRenderer:
|
||||
@ -373,6 +377,45 @@ MonoBehaviour:
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
radius: 26
|
||||
--- !u!114 &3003052478643551334
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 147043334410187602}
|
||||
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!114 &8129408236558198033
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 147043334410187602}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 59f8146938fff824cb5fd77236b75775, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Padding:
|
||||
m_Left: 10
|
||||
m_Right: 10
|
||||
m_Top: 10
|
||||
m_Bottom: 10
|
||||
m_ChildAlignment: 0
|
||||
m_Spacing: 6
|
||||
m_ChildForceExpandWidth: 1
|
||||
m_ChildForceExpandHeight: 1
|
||||
m_ChildControlWidth: 0
|
||||
m_ChildControlHeight: 0
|
||||
m_ChildScaleWidth: 0
|
||||
m_ChildScaleHeight: 0
|
||||
--- !u!1 &285203669389758375
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -501,11 +544,11 @@ RectTransform:
|
||||
m_Father: {fileID: 9114115754477968003}
|
||||
m_RootOrder: 0
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0.5}
|
||||
m_AnchorMax: {x: 0, y: 0.5}
|
||||
m_AnchoredPosition: {x: 20, y: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 40, y: -20}
|
||||
m_SizeDelta: {x: 60, y: 19}
|
||||
m_Pivot: {x: 0, y: 0.5}
|
||||
m_Pivot: {x: 0, y: 1}
|
||||
--- !u!222 &6312843494427679176
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -828,7 +871,7 @@ RectTransform:
|
||||
- {fileID: 8322632618302902071}
|
||||
- {fileID: 5443913270778593719}
|
||||
m_Father: {fileID: 4408462524766711656}
|
||||
m_RootOrder: 1
|
||||
m_RootOrder: 0
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 1, y: 1}
|
||||
@ -903,12 +946,13 @@ RectTransform:
|
||||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_Children:
|
||||
- {fileID: 4408462524766711656}
|
||||
- {fileID: 7118448401530350836}
|
||||
- {fileID: 7081805938635351733}
|
||||
- {fileID: 3808910954941481150}
|
||||
- {fileID: 6595848013761631944}
|
||||
- {fileID: 7825229638776794366}
|
||||
- {fileID: 4408462524766711656}
|
||||
- {fileID: 7578623247347515893}
|
||||
- {fileID: 9114115754477968003}
|
||||
m_Father: {fileID: 0}
|
||||
m_RootOrder: 0
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
@ -987,7 +1031,7 @@ RectTransform:
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 0, y: 0}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 84.5, y: 40}
|
||||
m_SizeDelta: {x: 0, y: 0}
|
||||
m_Pivot: {x: 0, y: 1}
|
||||
--- !u!222 &7635687608030458564
|
||||
CanvasRenderer:
|
||||
@ -1099,7 +1143,7 @@ GameObject:
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
m_IsActive: 0
|
||||
--- !u!224 &7052195156892582935
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -1384,6 +1428,93 @@ MonoBehaviour:
|
||||
m_OnClick:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
--- !u!1 &3539551045548655418
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 7578623247347515893}
|
||||
- component: {fileID: 8785394149248738042}
|
||||
- component: {fileID: 651155936983438114}
|
||||
- component: {fileID: 5471384715277200157}
|
||||
m_Layer: 5
|
||||
m_Name: MC
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 0
|
||||
--- !u!224 &7578623247347515893
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 3539551045548655418}
|
||||
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: 1673965681348374004}
|
||||
m_RootOrder: 5
|
||||
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: 1461, y: 1461}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &8785394149248738042
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 3539551045548655418}
|
||||
m_CullTransparentMesh: 0
|
||||
--- !u!114 &651155936983438114
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 3539551045548655418}
|
||||
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!225 &5471384715277200157
|
||||
CanvasGroup:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 3539551045548655418}
|
||||
m_Enabled: 1
|
||||
m_Alpha: 1
|
||||
m_Interactable: 1
|
||||
m_BlocksRaycasts: 1
|
||||
m_IgnoreParentGroups: 0
|
||||
--- !u!1 &3585584982514857543
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -1419,11 +1550,11 @@ RectTransform:
|
||||
m_Father: {fileID: 9114115754477968003}
|
||||
m_RootOrder: 2
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0.5}
|
||||
m_AnchorMax: {x: 0, y: 0.5}
|
||||
m_AnchoredPosition: {x: 459.5, y: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 40, y: -140}
|
||||
m_SizeDelta: {x: 82, y: 20}
|
||||
m_Pivot: {x: 0, y: 0.5}
|
||||
m_Pivot: {x: 0, y: 1}
|
||||
--- !u!222 &4393121095389363787
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -1521,10 +1652,9 @@ RectTransform:
|
||||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_Children:
|
||||
- {fileID: 9114115754477968003}
|
||||
- {fileID: 1584307428038433354}
|
||||
m_Father: {fileID: 1673965681348374004}
|
||||
m_RootOrder: 0
|
||||
m_RootOrder: 4
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 1, y: 1}
|
||||
@ -1619,7 +1749,7 @@ RectTransform:
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 1, y: 1}
|
||||
m_AnchoredPosition: {x: 0, y: -8}
|
||||
m_SizeDelta: {x: 0, y: -16}
|
||||
m_SizeDelta: {x: 0, y: -8}
|
||||
m_Pivot: {x: 0, y: 1}
|
||||
--- !u!222 &4605362255460975190
|
||||
CanvasRenderer:
|
||||
@ -1724,7 +1854,7 @@ MonoBehaviour:
|
||||
m_Left: 0
|
||||
m_Right: 0
|
||||
m_Top: 2
|
||||
m_Bottom: 2
|
||||
m_Bottom: 0
|
||||
m_ChildAlignment: 0
|
||||
m_StartCorner: 0
|
||||
m_StartAxis: 0
|
||||
@ -1784,7 +1914,7 @@ RectTransform:
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 0, y: 0}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 64, y: 40}
|
||||
m_SizeDelta: {x: 0, y: 0}
|
||||
m_Pivot: {x: 0, y: 1}
|
||||
--- !u!222 &260655509533004817
|
||||
CanvasRenderer:
|
||||
@ -1905,7 +2035,7 @@ RectTransform:
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 4875298439956012054}
|
||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
|
||||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_Children:
|
||||
@ -1915,14 +2045,14 @@ RectTransform:
|
||||
- {fileID: 1786430169159750715}
|
||||
- {fileID: 1128690593457696285}
|
||||
- {fileID: 7052195156892582935}
|
||||
m_Father: {fileID: 4408462524766711656}
|
||||
m_RootOrder: 0
|
||||
m_Father: {fileID: 1673965681348374004}
|
||||
m_RootOrder: 6
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 1, y: 1}
|
||||
m_AnchoredPosition: {x: 757, y: -132}
|
||||
m_SizeDelta: {x: 0, y: 79}
|
||||
m_Pivot: {x: 0.5, y: 1}
|
||||
m_AnchorMin: {x: 0, y: 0.5}
|
||||
m_AnchorMax: {x: 0, y: 0.5}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 324, y: 200}
|
||||
m_Pivot: {x: 1, y: 0.5}
|
||||
--- !u!222 &8398349872535909533
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -1944,7 +2074,7 @@ MonoBehaviour:
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Material: {fileID: 0}
|
||||
m_Color: {r: 0.13725491, g: 0.13725491, b: 0.1764706, a: 0.5019608}
|
||||
m_Color: {r: 0.20784314, g: 0.20784314, b: 0.2627451, a: 1}
|
||||
m_RaycastTarget: 1
|
||||
m_Maskable: 1
|
||||
m_OnCullStateChanged:
|
||||
@ -1972,8 +2102,8 @@ MonoBehaviour:
|
||||
m_Script: {fileID: 11500000, guid: 109c41f08973846429af681aea0a30c4, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
r: {x: 30, y: 30, z: 0, w: 0}
|
||||
rect2props: {x: 0.000061035156, y: -14.9999695, z: 269.05414, w: 269.05414}
|
||||
r: {x: 0, y: 30, z: 30, w: 0}
|
||||
rect2props: {x: -14.999985, y: -0.000015258789, z: 174.65538, w: 174.65538}
|
||||
--- !u!1 &4876623757515401105
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -2005,7 +2135,7 @@ RectTransform:
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_Children: []
|
||||
m_Father: {fileID: 1673965681348374004}
|
||||
m_RootOrder: 3
|
||||
m_RootOrder: 2
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0.5}
|
||||
m_AnchorMax: {x: 0, y: 0.5}
|
||||
@ -2059,6 +2189,124 @@ MonoBehaviour:
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
radius: 16
|
||||
--- !u!1 &4982987873835392669
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 7285418945995382289}
|
||||
- component: {fileID: 515406895472348376}
|
||||
- component: {fileID: 775727075689032949}
|
||||
- component: {fileID: 7655785314867318269}
|
||||
m_Layer: 5
|
||||
m_Name: BtnFilter
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &7285418945995382289
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 4982987873835392669}
|
||||
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: 6595848013761631944}
|
||||
m_RootOrder: 1
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 0, y: 0}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 32, y: 32}
|
||||
m_Pivot: {x: 0, y: 1}
|
||||
--- !u!114 &515406895472348376
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 4982987873835392669}
|
||||
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: 593b2dfe1fa703548b788b3a8bda3db5, 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!114 &775727075689032949
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 4982987873835392669}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Navigation:
|
||||
m_Mode: 3
|
||||
m_SelectOnUp: {fileID: 0}
|
||||
m_SelectOnDown: {fileID: 0}
|
||||
m_SelectOnLeft: {fileID: 0}
|
||||
m_SelectOnRight: {fileID: 0}
|
||||
m_Transition: 1
|
||||
m_Colors:
|
||||
m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
|
||||
m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
|
||||
m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
|
||||
m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
|
||||
m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
|
||||
m_ColorMultiplier: 1
|
||||
m_FadeDuration: 0.1
|
||||
m_SpriteState:
|
||||
m_HighlightedSprite: {fileID: 0}
|
||||
m_PressedSprite: {fileID: 0}
|
||||
m_SelectedSprite: {fileID: 0}
|
||||
m_DisabledSprite: {fileID: 0}
|
||||
m_AnimationTriggers:
|
||||
m_NormalTrigger: Normal
|
||||
m_HighlightedTrigger: Highlighted
|
||||
m_PressedTrigger: Pressed
|
||||
m_SelectedTrigger: Selected
|
||||
m_DisabledTrigger: Disabled
|
||||
m_Interactable: 1
|
||||
m_TargetGraphic: {fileID: 515406895472348376}
|
||||
m_OnClick:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
--- !u!222 &7655785314867318269
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 4982987873835392669}
|
||||
m_CullTransparentMesh: 0
|
||||
--- !u!1 &5043445467111231433
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -2070,13 +2318,14 @@ GameObject:
|
||||
- component: {fileID: 7081805938635351733}
|
||||
- component: {fileID: 5052066067678859807}
|
||||
- component: {fileID: 1032072723589897949}
|
||||
- component: {fileID: 201928919969191625}
|
||||
m_Layer: 5
|
||||
m_Name: gq
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &7081805938635351733
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -2089,7 +2338,7 @@ RectTransform:
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_Children: []
|
||||
m_Father: {fileID: 1673965681348374004}
|
||||
m_RootOrder: 2
|
||||
m_RootOrder: 1
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0.5}
|
||||
m_AnchorMax: {x: 0, y: 0.5}
|
||||
@ -2130,6 +2379,19 @@ MonoBehaviour:
|
||||
y: 0
|
||||
width: 1
|
||||
height: 1
|
||||
--- !u!114 &201928919969191625
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 5043445467111231433}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: adb30198aa32dd140b5750692dd48104, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
radius: 26
|
||||
--- !u!1 &5299950768805647023
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -2168,7 +2430,7 @@ RectTransform:
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 0, y: 0}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 54, y: 40}
|
||||
m_SizeDelta: {x: 0, y: 0}
|
||||
m_Pivot: {x: 0, y: 1}
|
||||
--- !u!222 &666701024294653921
|
||||
CanvasRenderer:
|
||||
@ -3009,8 +3271,8 @@ GameObject:
|
||||
m_Component:
|
||||
- component: {fileID: 6622883785745389145}
|
||||
- component: {fileID: 172587720231943750}
|
||||
- component: {fileID: 6874278690336828301}
|
||||
- component: {fileID: 2248256223810371087}
|
||||
- component: {fileID: 8492415683350052382}
|
||||
m_Layer: 5
|
||||
m_Name: StatusContainer
|
||||
m_TagString: Untagged
|
||||
@ -3036,11 +3298,11 @@ RectTransform:
|
||||
m_Father: {fileID: 9114115754477968003}
|
||||
m_RootOrder: 1
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0.5}
|
||||
m_AnchorMax: {x: 0, y: 0.5}
|
||||
m_AnchoredPosition: {x: 90, y: 0}
|
||||
m_SizeDelta: {x: 0, y: 40}
|
||||
m_Pivot: {x: 0, y: 0.5}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 40, y: -45}
|
||||
m_SizeDelta: {x: 0, y: 0}
|
||||
m_Pivot: {x: 0, y: 1}
|
||||
--- !u!222 &172587720231943750
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -3049,31 +3311,6 @@ CanvasRenderer:
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 7550427320849319888}
|
||||
m_CullTransparentMesh: 0
|
||||
--- !u!114 &6874278690336828301
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 7550427320849319888}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 30649d3a9faa99c48a7b1166b86bf2a0, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Padding:
|
||||
m_Left: 0
|
||||
m_Right: 0
|
||||
m_Top: 0
|
||||
m_Bottom: 0
|
||||
m_ChildAlignment: 0
|
||||
m_Spacing: 10
|
||||
m_ChildForceExpandWidth: 1
|
||||
m_ChildForceExpandHeight: 1
|
||||
m_ChildControlWidth: 0
|
||||
m_ChildControlHeight: 0
|
||||
m_ChildScaleWidth: 0
|
||||
m_ChildScaleHeight: 0
|
||||
--- !u!114 &2248256223810371087
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -3087,7 +3324,31 @@ MonoBehaviour:
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_HorizontalFit: 2
|
||||
m_VerticalFit: 0
|
||||
m_VerticalFit: 2
|
||||
--- !u!114 &8492415683350052382
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 7550427320849319888}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 8a8695521f0d02e499659fee002a26c2, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Padding:
|
||||
m_Left: 0
|
||||
m_Right: 0
|
||||
m_Top: 0
|
||||
m_Bottom: 0
|
||||
m_ChildAlignment: 0
|
||||
m_StartCorner: 0
|
||||
m_StartAxis: 0
|
||||
m_CellSize: {x: 86, y: 36}
|
||||
m_Spacing: {x: 3, y: 3}
|
||||
m_Constraint: 0
|
||||
m_ConstraintCount: 2
|
||||
--- !u!1 &7622538158514482902
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -3154,12 +3415,12 @@ RectTransform:
|
||||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_Children: []
|
||||
m_Father: {fileID: 1673965681348374004}
|
||||
m_RootOrder: 5
|
||||
m_Father: {fileID: 6595848013761631944}
|
||||
m_RootOrder: 0
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0.5}
|
||||
m_AnchorMax: {x: 0, y: 0.5}
|
||||
m_AnchoredPosition: {x: 40, y: 46}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 0, y: 0}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 32, y: 32}
|
||||
m_Pivot: {x: 0, y: 1}
|
||||
--- !u!114 &7196181606344597827
|
||||
@ -3332,7 +3593,7 @@ PrefabInstance:
|
||||
- target: {fileID: 3608523562535466787, guid: 07e45aecba1a2d542b043157aa2e9322,
|
||||
type: 3}
|
||||
propertyPath: m_AnchoredPosition.x
|
||||
value: -20
|
||||
value: -29
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3608523562535466787, guid: 07e45aecba1a2d542b043157aa2e9322,
|
||||
type: 3}
|
||||
@ -3359,6 +3620,11 @@ PrefabInstance:
|
||||
propertyPath: m_Name
|
||||
value: SearchInput
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4589186191166513557, guid: 07e45aecba1a2d542b043157aa2e9322,
|
||||
type: 3}
|
||||
propertyPath: m_IsActive
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7204820797918493515, guid: 07e45aecba1a2d542b043157aa2e9322,
|
||||
type: 3}
|
||||
propertyPath: m_Text
|
||||
@ -3366,18 +3632,18 @@ PrefabInstance:
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents: []
|
||||
m_SourcePrefab: {fileID: 100100000, guid: 07e45aecba1a2d542b043157aa2e9322, type: 3}
|
||||
--- !u!1 &3712583330546725488 stripped
|
||||
GameObject:
|
||||
m_CorrespondingSourceObject: {fileID: 1827088261433348456, guid: 07e45aecba1a2d542b043157aa2e9322,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 3089084281570681624}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!224 &1786430169159750715 stripped
|
||||
RectTransform:
|
||||
m_CorrespondingSourceObject: {fileID: 3608523562535466787, guid: 07e45aecba1a2d542b043157aa2e9322,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 3089084281570681624}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!1 &3712583330546725488 stripped
|
||||
GameObject:
|
||||
m_CorrespondingSourceObject: {fileID: 1827088261433348456, guid: 07e45aecba1a2d542b043157aa2e9322,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 3089084281570681624}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!1001 &5067779267173090679
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -3508,7 +3774,7 @@ PrefabInstance:
|
||||
- target: {fileID: 2638424933752433027, guid: a1999d0576fee6248a9c5a507ae8d10e,
|
||||
type: 3}
|
||||
propertyPath: m_RootOrder
|
||||
value: 1
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2638424933752433027, guid: a1999d0576fee6248a9c5a507ae8d10e,
|
||||
type: 3}
|
||||
@ -3798,15 +4064,15 @@ PrefabInstance:
|
||||
m_RemovedComponents:
|
||||
- {fileID: 829206726517620079, guid: a1999d0576fee6248a9c5a507ae8d10e, type: 3}
|
||||
m_SourcePrefab: {fileID: 100100000, guid: a1999d0576fee6248a9c5a507ae8d10e, type: 3}
|
||||
--- !u!224 &7118448401530350836 stripped
|
||||
RectTransform:
|
||||
m_CorrespondingSourceObject: {fileID: 2638424933752433027, guid: a1999d0576fee6248a9c5a507ae8d10e,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 5067779267173090679}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!1 &7118448401530350837 stripped
|
||||
GameObject:
|
||||
m_CorrespondingSourceObject: {fileID: 2638424933752433026, guid: a1999d0576fee6248a9c5a507ae8d10e,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 5067779267173090679}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!224 &7118448401530350836 stripped
|
||||
RectTransform:
|
||||
m_CorrespondingSourceObject: {fileID: 2638424933752433027, guid: a1999d0576fee6248a9c5a507ae8d10e,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 5067779267173090679}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
||||
@ -314,9 +314,10 @@ RectTransform:
|
||||
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_Children:
|
||||
- {fileID: 7825229638776794366}
|
||||
m_Father: {fileID: 1673965681348374004}
|
||||
m_RootOrder: 4
|
||||
m_RootOrder: 5
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
@ -829,7 +830,7 @@ RectTransform:
|
||||
- {fileID: 8322632618302902071}
|
||||
- {fileID: 5443913270778593719}
|
||||
m_Father: {fileID: 4408462524766711656}
|
||||
m_RootOrder: 2
|
||||
m_RootOrder: 1
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 1, y: 1}
|
||||
@ -934,11 +935,11 @@ RectTransform:
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_Children:
|
||||
- {fileID: 4408462524766711656}
|
||||
- {fileID: 9114115754477968003}
|
||||
- {fileID: 7118448401530350836}
|
||||
- {fileID: 7081805938635351733}
|
||||
- {fileID: 3808910954941481150}
|
||||
- {fileID: 6595848013761631944}
|
||||
- {fileID: 7825229638776794366}
|
||||
m_Father: {fileID: 0}
|
||||
m_RootOrder: 0
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
@ -1549,7 +1550,6 @@ RectTransform:
|
||||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_Children:
|
||||
- {fileID: 9114115754477968003}
|
||||
- {fileID: 4605362255150436664}
|
||||
- {fileID: 1584307428038433354}
|
||||
m_Father: {fileID: 1673965681348374004}
|
||||
@ -1598,7 +1598,7 @@ RectTransform:
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_Children: []
|
||||
m_Father: {fileID: 4408462524766711656}
|
||||
m_RootOrder: 1
|
||||
m_RootOrder: 0
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 1, y: 1}
|
||||
@ -1965,7 +1965,7 @@ RectTransform:
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 4875298439956012054}
|
||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
|
||||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_Children:
|
||||
@ -1975,13 +1975,13 @@ RectTransform:
|
||||
- {fileID: 1786430169159750715}
|
||||
- {fileID: 1128690593457696285}
|
||||
- {fileID: 7052195156892582935}
|
||||
m_Father: {fileID: 4408462524766711656}
|
||||
m_RootOrder: 0
|
||||
m_Father: {fileID: 1673965681348374004}
|
||||
m_RootOrder: 1
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 1, y: 1}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 0, y: 79}
|
||||
m_AnchorMin: {x: 0.5, y: 1}
|
||||
m_AnchorMax: {x: 0.5, y: 1}
|
||||
m_AnchoredPosition: {x: 0, y: -165}
|
||||
m_SizeDelta: {x: 750, y: 79}
|
||||
m_Pivot: {x: 0.5, y: 1}
|
||||
--- !u!222 &8398349872535909533
|
||||
CanvasRenderer:
|
||||
@ -2033,7 +2033,7 @@ MonoBehaviour:
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
r: {x: 30, y: 30, z: 0, w: 0}
|
||||
rect2props: {x: -0.0000076293945, y: -15.000006, z: -25.102293, w: -25.102293}
|
||||
rect2props: {x: 0.000061035156, y: -14.9999695, z: 282.48917, w: 282.48917}
|
||||
--- !u!1 &4876623757515401105
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -2065,7 +2065,7 @@ RectTransform:
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_Children: []
|
||||
m_Father: {fileID: 1673965681348374004}
|
||||
m_RootOrder: 3
|
||||
m_RootOrder: 4
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 1, y: 1}
|
||||
m_AnchorMax: {x: 1, y: 1}
|
||||
@ -2149,7 +2149,7 @@ RectTransform:
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_Children: []
|
||||
m_Father: {fileID: 1673965681348374004}
|
||||
m_RootOrder: 2
|
||||
m_RootOrder: 3
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 1, y: 1}
|
||||
m_AnchorMax: {x: 1, y: 1}
|
||||
@ -3163,12 +3163,12 @@ RectTransform:
|
||||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_Children: []
|
||||
m_Father: {fileID: 1673965681348374004}
|
||||
m_RootOrder: 5
|
||||
m_Father: {fileID: 6595848013761631944}
|
||||
m_RootOrder: 0
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 262, y: -40}
|
||||
m_AnchoredPosition: {x: 10, y: -10}
|
||||
m_SizeDelta: {x: 44, y: 44}
|
||||
m_Pivot: {x: 0, y: 1}
|
||||
--- !u!114 &7196181606344597827
|
||||
@ -3477,7 +3477,7 @@ PrefabInstance:
|
||||
- target: {fileID: 2638424933752433027, guid: a1999d0576fee6248a9c5a507ae8d10e,
|
||||
type: 3}
|
||||
propertyPath: m_RootOrder
|
||||
value: 1
|
||||
value: 2
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2638424933752433027, guid: a1999d0576fee6248a9c5a507ae8d10e,
|
||||
type: 3}
|
||||
|
||||
@ -29,7 +29,8 @@ RectTransform:
|
||||
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_Children:
|
||||
- {fileID: 3454093997580430476}
|
||||
m_Father: {fileID: 0}
|
||||
m_RootOrder: 0
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
@ -85,3 +86,163 @@ MonoBehaviour:
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
radius: 20
|
||||
--- !u!1001 &312552726881420844
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
serializedVersion: 2
|
||||
m_Modification:
|
||||
m_TransformParent: {fileID: 6596492163791180230}
|
||||
m_Modifications:
|
||||
- target: {fileID: 545917028276686471, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
|
||||
type: 3}
|
||||
propertyPath: m_SizeDelta.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
|
||||
type: 3}
|
||||
propertyPath: m_Pivot.x
|
||||
value: 0.5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
|
||||
type: 3}
|
||||
propertyPath: m_Pivot.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
|
||||
type: 3}
|
||||
propertyPath: m_RootOrder
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
|
||||
type: 3}
|
||||
propertyPath: m_AnchorMax.x
|
||||
value: 0.5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
|
||||
type: 3}
|
||||
propertyPath: m_AnchorMax.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
|
||||
type: 3}
|
||||
propertyPath: m_AnchorMin.x
|
||||
value: 0.5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
|
||||
type: 3}
|
||||
propertyPath: m_AnchorMin.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
|
||||
type: 3}
|
||||
propertyPath: m_SizeDelta.x
|
||||
value: 74
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
|
||||
type: 3}
|
||||
propertyPath: m_SizeDelta.y
|
||||
value: 32
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
|
||||
type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
|
||||
type: 3}
|
||||
propertyPath: m_LocalPosition.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
|
||||
type: 3}
|
||||
propertyPath: m_LocalPosition.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
|
||||
type: 3}
|
||||
propertyPath: m_LocalRotation.w
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
|
||||
type: 3}
|
||||
propertyPath: m_LocalRotation.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
|
||||
type: 3}
|
||||
propertyPath: m_LocalRotation.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
|
||||
type: 3}
|
||||
propertyPath: m_LocalRotation.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
|
||||
type: 3}
|
||||
propertyPath: m_AnchoredPosition.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
|
||||
type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: 10
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
|
||||
type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
|
||||
type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
|
||||
type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3150550772099312289, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
|
||||
type: 3}
|
||||
propertyPath: m_Name
|
||||
value: BtnEnter
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3150550772916003707, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
|
||||
type: 3}
|
||||
propertyPath: m_Text
|
||||
value: Enter
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5329299856310536127, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
|
||||
type: 3}
|
||||
propertyPath: m_AnchorMax.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5329299856310536127, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
|
||||
type: 3}
|
||||
propertyPath: m_AnchorMin.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5329299856310536127, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
|
||||
type: 3}
|
||||
propertyPath: m_AnchoredPosition.x
|
||||
value: 20
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5329299856310536127, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
|
||||
type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8688565590564084001, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
|
||||
type: 3}
|
||||
propertyPath: mType
|
||||
value: 2
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents: []
|
||||
m_SourcePrefab: {fileID: 100100000, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, type: 3}
|
||||
--- !u!224 &3454093997580430476 stripped
|
||||
RectTransform:
|
||||
m_CorrespondingSourceObject: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 312552726881420844}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
||||
@ -2125,6 +2125,7 @@ GameObject:
|
||||
- component: {fileID: 7321607841691860978}
|
||||
- component: {fileID: 4243303135242065321}
|
||||
- component: {fileID: 218743860388316554}
|
||||
- component: {fileID: 8751394785182685024}
|
||||
m_Layer: 5
|
||||
m_Name: Status
|
||||
m_TagString: Untagged
|
||||
@ -2225,6 +2226,18 @@ MonoBehaviour:
|
||||
m_EditorClassIdentifier:
|
||||
m_HorizontalFit: 2
|
||||
m_VerticalFit: 0
|
||||
--- !u!225 &8751394785182685024
|
||||
CanvasGroup:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 6963744598854301550}
|
||||
m_Enabled: 1
|
||||
m_Alpha: 1
|
||||
m_Interactable: 1
|
||||
m_BlocksRaycasts: 1
|
||||
m_IgnoreParentGroups: 0
|
||||
--- !u!1 &7468074698396101124
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
||||
@ -113,7 +113,7 @@ RectTransform:
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 0, y: 0}
|
||||
m_AnchoredPosition: {x: 35, y: 0}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 0, y: 14}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &4283453029241301366
|
||||
@ -171,6 +171,69 @@ MonoBehaviour:
|
||||
m_EditorClassIdentifier:
|
||||
m_HorizontalFit: 2
|
||||
m_VerticalFit: 0
|
||||
--- !u!1 &1594929395943128068
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 3133714956822662103}
|
||||
- component: {fileID: 7495680204347569398}
|
||||
- component: {fileID: 6387954282718075555}
|
||||
m_Layer: 5
|
||||
m_Name: textController
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 0
|
||||
--- !u!224 &3133714956822662103
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1594929395943128068}
|
||||
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: 6024573468857070111}
|
||||
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: 28, y: 11}
|
||||
m_SizeDelta: {x: 100, y: 100}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!114 &7495680204347569398
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1594929395943128068}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 55b5a59897c650342a9b23ff348a9992, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
--- !u!114 &6387954282718075555
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1594929395943128068}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: f8c8bf670921e114bbea10f451c86392, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
Camera: {fileID: 0}
|
||||
PlaneDistance: 20
|
||||
--- !u!1 &1875779720381973549
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -304,6 +367,55 @@ CanvasGroup:
|
||||
m_Interactable: 1
|
||||
m_BlocksRaycasts: 1
|
||||
m_IgnoreParentGroups: 0
|
||||
--- !u!1 &2518379931765104815
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 6024573468857070111}
|
||||
- component: {fileID: 4942439251290342389}
|
||||
m_Layer: 0
|
||||
m_Name: New Game Object
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 0
|
||||
--- !u!224 &6024573468857070111
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 2518379931765104815}
|
||||
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: 3133714956822662103}
|
||||
m_Father: {fileID: 3781681077856850776}
|
||||
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: 10, y: -11}
|
||||
m_SizeDelta: {x: 0, y: 22}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!114 &4942439251290342389
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 2518379931765104815}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 55b5a59897c650342a9b23ff348a9992, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
--- !u!1 &3582975722771982388
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -1865,7 +1977,7 @@ GameObject:
|
||||
- component: {fileID: 1745325752441454819}
|
||||
- component: {fileID: 6307907517525328669}
|
||||
- component: {fileID: 4025239828189630988}
|
||||
- component: {fileID: 3178332653893988551}
|
||||
- component: {fileID: 1989110628175331005}
|
||||
m_Layer: 5
|
||||
m_Name: Text
|
||||
m_TagString: Untagged
|
||||
@ -1889,7 +2001,7 @@ RectTransform:
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 0, y: 0}
|
||||
m_AnchoredPosition: {x: 29, y: 0}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 0, y: 22}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &6307907517525328669
|
||||
@ -1932,8 +2044,8 @@ MonoBehaviour:
|
||||
m_HorizontalOverflow: 0
|
||||
m_VerticalOverflow: 0
|
||||
m_LineSpacing: 1
|
||||
m_Text: Booked
|
||||
--- !u!114 &3178332653893988551
|
||||
m_Text: Booker
|
||||
--- !u!114 &1989110628175331005
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
@ -2125,6 +2237,9 @@ GameObject:
|
||||
- component: {fileID: 7321607841691860978}
|
||||
- component: {fileID: 4243303135242065321}
|
||||
- component: {fileID: 218743860388316554}
|
||||
- component: {fileID: 6879336690456023343}
|
||||
- component: {fileID: 222947245583201638}
|
||||
- component: {fileID: 1028197714189782262}
|
||||
m_Layer: 5
|
||||
m_Name: Status
|
||||
m_TagString: Untagged
|
||||
@ -2144,6 +2259,7 @@ RectTransform:
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_Children:
|
||||
- {fileID: 1745325752441454819}
|
||||
- {fileID: 6024573468857070111}
|
||||
m_Father: {fileID: 5521075338391914460}
|
||||
m_RootOrder: 4
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
@ -2179,7 +2295,7 @@ MonoBehaviour:
|
||||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_Texture: {fileID: 2800000, guid: 4214119458c589c409b03681f25e73d8, type: 3}
|
||||
m_Texture: {fileID: 0}
|
||||
m_UVRect:
|
||||
serializedVersion: 2
|
||||
x: 0
|
||||
@ -2223,8 +2339,46 @@ MonoBehaviour:
|
||||
m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_HorizontalFit: 2
|
||||
m_HorizontalFit: 1
|
||||
m_VerticalFit: 0
|
||||
--- !u!114 &6879336690456023343
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 6963744598854301550}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 109c41f08973846429af681aea0a30c4, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
r: {x: 0, y: 10, z: 0, w: 10}
|
||||
rect2props: {x: 0.0000004172325, y: -0.0000014901161, z: 7.7781754, w: 0.7071068}
|
||||
--- !u!225 &222947245583201638
|
||||
CanvasGroup:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 6963744598854301550}
|
||||
m_Enabled: 1
|
||||
m_Alpha: 1
|
||||
m_Interactable: 1
|
||||
m_BlocksRaycasts: 1
|
||||
m_IgnoreParentGroups: 0
|
||||
--- !u!114 &1028197714189782262
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 6963744598854301550}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: d832f1dc5650bd24b90dbd3efdc2780e, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
--- !u!1 &7468074698396101124
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -11,7 +11,7 @@ using Assets.Scripts.Devices;
|
||||
|
||||
public static class App
|
||||
{
|
||||
public static string Host = "http://192.168.0.101:5184/";
|
||||
public static string Host = "http://192.168.0.101:5085/";
|
||||
|
||||
public static string AppVersion = Application.version;
|
||||
|
||||
|
||||
@ -8,9 +8,9 @@ public class ImageSelectorController
|
||||
private AndroidJavaObject mainActivityObject = null;
|
||||
#if UNITY_IOS
|
||||
[DllImport("__Internal")]
|
||||
private static extern void IOS_OpenCamera();
|
||||
private static extern void IOS_OpenCamera(string pageName);
|
||||
[DllImport("__Internal")]
|
||||
private static extern void IOS_OpenAlbum();
|
||||
private static extern void IOS_OpenAlbum(string pageName);
|
||||
#endif
|
||||
private static ImageSelectorController _instance;
|
||||
public static ImageSelectorController Instance
|
||||
@ -35,12 +35,13 @@ public class ImageSelectorController
|
||||
//RegisterApp(_APP_ID);
|
||||
#endif
|
||||
}
|
||||
public void Select()
|
||||
|
||||
public void Select(string pageName)
|
||||
{
|
||||
#if UNITY_IOS
|
||||
IOS_OpenAlbum();
|
||||
IOS_OpenAlbum(pageName);
|
||||
#else
|
||||
mainActivityObject.Call("Select");
|
||||
mainActivityObject.Call("Select",pageName);
|
||||
#endif
|
||||
}
|
||||
}
|
||||
8
Assets/Scripts/Mobile/Interface.meta
Normal file
8
Assets/Scripts/Mobile/Interface.meta
Normal file
@ -0,0 +1,8 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 95192428b4cb1074ebe79c54bc82b61c
|
||||
folderAsset: yes
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
@ -0,0 +1,13 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Text;
|
||||
using System.Threading.Tasks;
|
||||
|
||||
namespace Assets.Scripts.Mobile.Interface
|
||||
{
|
||||
interface INativeOnMobileImageSelect
|
||||
{
|
||||
void OnMobileImageSelect(string res);
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,11 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 20d3ae0f40b27134cbb2f6f710329532
|
||||
MonoImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 2
|
||||
defaultReferences: []
|
||||
executionOrder: 0
|
||||
icon: {instanceID: 0}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
@ -1,5 +1,6 @@
|
||||
using Assets.Scripts;
|
||||
using Assets.Scripts.Apis;
|
||||
using Assets.Scripts.Mobile.Interface;
|
||||
using Assets.Scripts.UI.Control;
|
||||
using System;
|
||||
using System.Collections;
|
||||
@ -9,7 +10,7 @@ using UnityEngine;
|
||||
using UnityEngine.EventSystems;
|
||||
using UnityEngine.UI;
|
||||
|
||||
public class FeedbackController : PFUIPanel
|
||||
public class FeedbackController : PFUIPanel, INativeOnMobileImageSelect
|
||||
{
|
||||
// Start is called before the first frame update
|
||||
Transform main,images;
|
||||
@ -80,7 +81,7 @@ public class FeedbackController : PFUIPanel
|
||||
{
|
||||
#if UNITY_ANDROID || UNITY_IOS
|
||||
selectObject = ((PointerEventData)e).pointerEnter;
|
||||
App.imageSelectorController.Select();
|
||||
App.imageSelectorController.Select("FeedbackModal(Clone)");
|
||||
#else
|
||||
var self = ((PointerEventData)e).pointerEnter;
|
||||
Utils.OpenFile((path) =>
|
||||
|
||||
@ -1,6 +1,7 @@
|
||||
using Assets.Scripts;
|
||||
using Assets.Scripts.Apis;
|
||||
using Assets.Scripts.Apis.Models;
|
||||
using Assets.Scripts.Mobile.Interface;
|
||||
using Assets.Scripts.UI.Control;
|
||||
using Assets.Scripts.UI.UIEffect;
|
||||
using DG.Tweening;
|
||||
@ -17,7 +18,7 @@ using UnityEngine.EventSystems;
|
||||
using UnityEngine.SceneManagement;
|
||||
using UnityEngine.UI;
|
||||
|
||||
public class EditUserController : PFUIPanel
|
||||
public class EditUserController : PFUIPanel, INativeOnMobileImageSelect
|
||||
{
|
||||
private Button mSaveButton;
|
||||
private PFUIDropdown mSexDropdown;
|
||||
@ -104,6 +105,7 @@ public class EditUserController : PFUIPanel
|
||||
UIManager.AddEvent(mBackButton.gameObject, EventTriggerType.PointerClick, Cancel);
|
||||
UIManager.AddEvent(mChangeAvatar.gameObject, EventTriggerType.PointerClick, (e) =>
|
||||
{
|
||||
#if !(UNITY_ANDROID || UNITY_IOS)
|
||||
OpenFileName ofn = new OpenFileName();
|
||||
|
||||
ofn.structSize = Marshal.SizeOf(ofn);
|
||||
@ -131,6 +133,9 @@ public class EditUserController : PFUIPanel
|
||||
{
|
||||
ChangeAvatar(ofn.file);
|
||||
}
|
||||
#else
|
||||
App.imageSelectorController.Select("EditUserPanel(Clone)");
|
||||
#endif
|
||||
});
|
||||
|
||||
linkContainer = transform.Find("LinkContainer");
|
||||
@ -425,4 +430,13 @@ public class EditUserController : PFUIPanel
|
||||
// UIManager.ShowPrePanel();
|
||||
//}
|
||||
}
|
||||
|
||||
public void OnMobileImageSelect(string res)
|
||||
{
|
||||
if (res.IndexOf("true,") == 0)
|
||||
{
|
||||
var path = res.Replace("true,", "");
|
||||
ChangeAvatar(path);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -138,7 +138,7 @@ public class HomeController : PFUIPanel
|
||||
}
|
||||
else
|
||||
{
|
||||
UIManager.ShowConfirm("未检测到应用", "是否前往官网下载?", () =>
|
||||
UIManager.ShowConfirm("Workouts not installed", "Go to the official website to download?", () =>
|
||||
{
|
||||
UIManager.CloseConfirm();
|
||||
Application.OpenURL("http://www.powerfun.com/Download");
|
||||
|
||||
@ -57,7 +57,6 @@ public class MapListController : PFUIPanel
|
||||
//rectTransform.offsetMin = new Vector2(0, offsetMin.y);
|
||||
var widthDelta = (transform.parent.parent.GetComponent<RectTransform>().sizeDelta.x -
|
||||
transform.GetComponent<RectTransform>().sizeDelta.x)/2;
|
||||
Debug.Log(widthDelta);
|
||||
//筛选按钮
|
||||
var topRect = topContainer.GetComponent<RectTransform>();
|
||||
topRect.localPosition = new Vector3(topRect.localPosition.x - widthDelta
|
||||
|
||||
@ -165,11 +165,17 @@ public class RaceHomeScript : RaceScript
|
||||
//{
|
||||
// banner.GetComponent<RawImage>().color = Utils.HexToColorHtml("#0000ff");
|
||||
//}
|
||||
|
||||
UIManager.AddEvent(banner.gameObject, UnityEngine.EventSystems.EventTriggerType.PointerClick, b =>
|
||||
#if !(UNITY_ANDROID || UNITY_IOS)
|
||||
UIManager.AddEvent(banner, UnityEngine.EventSystems.EventTriggerType.PointerClick, b =>
|
||||
{
|
||||
OnBannerClick(activity);
|
||||
});
|
||||
#else
|
||||
UIManager.AddEvent(banner.transform.Find("BtnEnter").gameObject, UnityEngine.EventSystems.EventTriggerType.PointerClick, b =>
|
||||
{
|
||||
OnBannerClick(activity);
|
||||
});
|
||||
#endif
|
||||
banner.transform.SetParent(scroll.content);
|
||||
dot.GetComponent<Image>().color =
|
||||
i == 0 ? Utils.HexToColorHtml("#f93086") : Utils.HexToColorHtml("#ffffff");
|
||||
|
||||
@ -193,22 +193,27 @@ public class RaceItemScript : MonoBehaviour
|
||||
var status = transform.Find("Status");
|
||||
if (mapCompetition.Status <= 1)
|
||||
{
|
||||
status.gameObject.SetActive(false);
|
||||
status.GetComponent<CanvasGroup>().alpha = 0;
|
||||
}
|
||||
else
|
||||
{
|
||||
status.GetComponent<RawImage>().color = Utils.HexToColorHtml(statusColorDict[mapCompetition.Status]);
|
||||
if (mapCompetition.Status == 2 && !mapCompetition.HasJoin)
|
||||
{
|
||||
status.gameObject.SetActive(false);
|
||||
status.GetComponent<CanvasGroup>().alpha = 0;
|
||||
}
|
||||
else
|
||||
{
|
||||
status.gameObject.SetActive(true);
|
||||
status.GetComponent<CanvasGroup>().alpha = 1;
|
||||
status.Find("Text").GetComponent<Text>().text =
|
||||
mapCompetition.Status == 2?"Registered":mapCompetition.StatusVlaue;
|
||||
}
|
||||
}
|
||||
if (status.GetComponent<ContentFitterController>())
|
||||
{
|
||||
Debug.Log("cf刷新一次1");
|
||||
status.GetComponent<ContentFitterController>().Refresh();
|
||||
}
|
||||
}
|
||||
float? localY = null;
|
||||
public void OnPointerExit(PointerEventData eventData)
|
||||
|
||||
@ -14,7 +14,7 @@ public class RaceListScript : RaceScript
|
||||
{
|
||||
// Start is called before the first frame update
|
||||
private GameObject scroll;
|
||||
private Transform content,statusOptionContainer, reserveContainer,dirContainer, searchInput,btnReturn,avatar;
|
||||
private Transform content,statusOptionContainer, reserveContainer,dirContainer, searchInput,btnReturn,avatar, btnFilter,conditions;
|
||||
private bool startMouse = false,isEnd = false;
|
||||
private int pageIndex = 0, pageSize = 24;
|
||||
private string raceName = "";
|
||||
@ -70,7 +70,8 @@ public class RaceListScript : RaceScript
|
||||
content = scroll.GetComponent<ScrollRect>().content;
|
||||
UIManager.AddEvent(scroll, UnityEngine.EventSystems.EventTriggerType.EndDrag, OnEndDrag);
|
||||
}
|
||||
statusOptionContainer = transform.Find("ListContainer/Conditions/StatusContainer");
|
||||
conditions = transform.Find("Conditions");
|
||||
statusOptionContainer = conditions.Find("StatusContainer");
|
||||
if (statusOptionContainer != null)
|
||||
{
|
||||
foreach (Transform t in statusOptionContainer)
|
||||
@ -140,7 +141,7 @@ public class RaceListScript : RaceScript
|
||||
}
|
||||
}
|
||||
}
|
||||
reserveContainer = transform.Find("ListContainer/Conditions/ReserveContainer");
|
||||
reserveContainer = conditions.Find("ReserveContainer");
|
||||
if (reserveContainer != null)
|
||||
{
|
||||
UIManager.AddEvent(reserveContainer.gameObject, UnityEngine.EventSystems.EventTriggerType.PointerClick, b=>
|
||||
@ -152,7 +153,7 @@ public class RaceListScript : RaceScript
|
||||
Refresh();
|
||||
});
|
||||
}
|
||||
dirContainer = transform.Find("ListContainer/Conditions/Dir");
|
||||
dirContainer = transform.Find("Dir");
|
||||
if (dirContainer != null)
|
||||
{
|
||||
var image = dirContainer.Find("Image").GetComponent<Image>();
|
||||
@ -171,7 +172,7 @@ public class RaceListScript : RaceScript
|
||||
Refresh();
|
||||
});
|
||||
}
|
||||
searchInput = transform.Find("ListContainer/Conditions/SearchInput");
|
||||
searchInput = transform.Find("SearchInput");
|
||||
if (searchInput != null)
|
||||
{
|
||||
//UIManager.AddEvent(searchInput.Find("Button").gameObject, EventTriggerType.PointerClick, (b) =>
|
||||
@ -183,7 +184,7 @@ public class RaceListScript : RaceScript
|
||||
onEndEdit();
|
||||
});
|
||||
}
|
||||
btnReturn = transform.Find("BtnReturn");
|
||||
btnReturn = transform.Find("SwitchMode/BtnReturn");
|
||||
if (btnReturn != null)
|
||||
{
|
||||
UIManager.AddEvent(btnReturn.gameObject, EventTriggerType.PointerClick, (b) =>
|
||||
@ -191,6 +192,8 @@ public class RaceListScript : RaceScript
|
||||
UIManager.ShowRaceHomePanel(true);
|
||||
});
|
||||
}
|
||||
|
||||
|
||||
//Refresh();
|
||||
}
|
||||
protected override void Start()
|
||||
@ -204,6 +207,33 @@ public class RaceListScript : RaceScript
|
||||
var rect = transform.GetComponent<RectTransform>();
|
||||
rect.offsetMax = new Vector2(rect.offsetMax.x, 0);
|
||||
rect.offsetMin = new Vector2(rect.offsetMin.x, 0);
|
||||
|
||||
var widthDelta = (transform.parent.parent.GetComponent<RectTransform>().sizeDelta.x -
|
||||
transform.GetComponent<RectTransform>().sizeDelta.x) / 2;
|
||||
var topRect = conditions.GetComponent<RectTransform>();
|
||||
topRect.localPosition = new Vector3(topRect.localPosition.x - widthDelta
|
||||
, topRect.localPosition.y, topRect.localPosition.z);
|
||||
if (!App.topRectStartX.HasValue)
|
||||
{
|
||||
App.topRectStartX = topRect.localPosition.x;
|
||||
}
|
||||
|
||||
var mc = transform.Find("MC");
|
||||
UIManager.AddEvent(transform.Find("SwitchMode/BtnFilter").gameObject, EventTriggerType.PointerClick, b =>
|
||||
{
|
||||
conditions.DOLocalMoveX(App.topRectStartX.Value + topRect.rect.width, 0.3f);
|
||||
mc.gameObject.SetActive(true);
|
||||
mc.GetComponent<CanvasGroup>().alpha = 0;
|
||||
mc.GetComponent<CanvasGroup>().DOFade(1, 0.3f);
|
||||
});
|
||||
UIManager.AddEvent(mc.gameObject, EventTriggerType.PointerClick, b =>
|
||||
{
|
||||
conditions.DOLocalMoveX(App.topRectStartX.Value, 0.3f);
|
||||
mc.GetComponent<CanvasGroup>().DOFade(0, 0.3f).onComplete = () =>
|
||||
{
|
||||
mc.gameObject.SetActive(false);
|
||||
};
|
||||
});
|
||||
#else
|
||||
#endif
|
||||
}
|
||||
|
||||
@ -214,6 +214,7 @@ public class UIManager : MonoBehaviour
|
||||
public static void ShowRaceDetailModal(Transform parent,MapCompetition mapCompetition)
|
||||
{
|
||||
UIManager.Show(UIManager.Instance.RaceDetailModal, null, true);
|
||||
UIManager.Instance.RaceDetailModal.transform.SetAsFirstSibling();
|
||||
UIManager.Instance.mRaceModalScript.Initial(parent, mapCompetition);
|
||||
//UIManager.Show(UIManager.Instance.RaceListPanel, UIManager.Instance.MainPanel);
|
||||
}
|
||||
|
||||
@ -22,7 +22,7 @@ PlayerSettings:
|
||||
m_SplashScreenOverlayOpacity: 1
|
||||
m_SplashScreenAnimation: 1
|
||||
m_SplashScreenLogoStyle: 1
|
||||
m_SplashScreenDrawMode: 1
|
||||
m_SplashScreenDrawMode: 0
|
||||
m_SplashScreenBackgroundAnimationZoom: 1
|
||||
m_SplashScreenLogoAnimationZoom: 1
|
||||
m_SplashScreenBackgroundLandscapeAspect: 1
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user