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

Merge remote-tracking branch 'origin/dev_m1' into dev_mobile_ble

Browse Source 
# Conflicts:
#	Assets/Scripts/App.cs
This commit is contained in:
lishuo committed 2021-09-03 15:12:01 +08:00
2 parents 7af935118e 169b9719f6
commit 467a6f3810
33 files changed
+3529 -3073
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Assets/Resources/Circle/ImageWithIndependentRoundedCorners.cs
+1 -1
View File
@@ -65,7 +65,7 @@ public class ImageWithIndependentRoundedCorners : MonoBehaviour {
rect2props.y = origin.y;
}
private void Refresh(){
public void Refresh(){
if (material == null)
{
material = Instantiate(Resources.Load<Material>("UI/Material/IndependentCornersMaterial"));
Assets/Resources/Images/Mobile/赛事角标.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 363 B

Assets/Resources/Images/Mobile/赛事角标.png.meta
+128
View File
@@ -0,0 +1,128 @@
fileFormatVersion: 2
guid: 4214119458c589c409b03681f25e73d8
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: 10, y: 10, z: 10, w: 10}
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:
Assets/Resources/UI/Prefab/MapList/MapItem-Mobile.prefab
+2 -2
View File
@@ -1020,8 +1020,8 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 109c41f08973846429af681aea0a30c4, type: 3}
m_Name:
m_EditorClassIdentifier:
r: {x: 0, y: 10, z: 0, w: 20}
rect2props: {x: 2.500002, y: 2.4999971, z: 25.455845, w: 14.849243}
r: {x: 0, y: 10, z: 0, w: 10}
rect2props: {x: 0.0000019073486, y: -0.000002861023, z: 25.455845, w: 18.384777}
--- !u!114 &779702596189099878
MonoBehaviour:
m_ObjectHideFlags: 0
Assets/Resources/UI/Prefab/Panel/EarthPanel.prefab
+716 -770
View File
File diff suppressed because it is too large. Load diff
Assets/Resources/UI/Prefab/Panel/Mobile/BigMapPanel.prefab
+7 -7
View File
@@ -85,8 +85,8 @@ RectTransform:
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: -42}
m_SizeDelta: {x: 0, y: -42}
m_AnchoredPosition: {x: 0, y: -40}
m_SizeDelta: {x: 0, y: -40}
m_Pivot: {x: 0, y: 1}
--- !u!222 &8651722119234584007
CanvasRenderer:
@@ -737,8 +737,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 10, y: 0}
m_SizeDelta: {x: -20, y: -10}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: -10}
m_Pivot: {x: 0, y: 1}
--- !u!222 &3307903802500755807
CanvasRenderer:
@@ -1414,8 +1414,8 @@ RectTransform:
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: 0}
m_AnchoredPosition: {x: 10, y: 0}
m_SizeDelta: {x: -20, y: 0}
m_Pivot: {x: 0, y: 1}
--- !u!114 &8158116878463612347
MonoBehaviour:
@@ -1432,7 +1432,7 @@ MonoBehaviour:
m_Padding:
m_Left: 0
m_Right: 0
m_Top: 0
m_Top: 2
m_Bottom: 0
m_ChildAlignment: 0
m_Spacing: 8
Assets/Resources/UI/Prefab/Panel/Mobile/EarthPanel.prefab
+916 -690
View File
File diff suppressed because it is too large. Load diff
Assets/Resources/UI/Prefab/Panel/Mobile/FeedbackModal.prefab
+12 -12
View File
@@ -1079,7 +1079,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
m_IsActive: 1
--- !u!224 &9042306397261385604
RectTransform:
m_ObjectHideFlags: 0
@@ -1100,7 +1100,7 @@ RectTransform:
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 220, y: -226}
m_SizeDelta: {x: 175, y: 55}
m_SizeDelta: {x: 0, y: 55}
m_Pivot: {x: 0, y: 1}
--- !u!222 &9042306397261385606
CanvasRenderer:
@@ -1512,9 +1512,9 @@ RectTransform:
m_Father: {fileID: 9042306397261385604}
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: 27.5, y: -27.5}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 55, y: 55}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &9042306397874659813
@@ -2041,9 +2041,9 @@ RectTransform:
m_Father: {fileID: 9042306397261385604}
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: 87.5, y: -27.5}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 55, y: 55}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &9042306398366161329
@@ -2628,9 +2628,9 @@ RectTransform:
m_Father: {fileID: 9042306397261385604}
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: 147.5, y: -27.5}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 55, y: 55}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &9042306398982995305
@@ -3284,7 +3284,7 @@ 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}
Assets/Resources/UI/Prefab/Panel/Mobile/MapListPanel.prefab
+51 -38
View File
@@ -1512,7 +1512,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 1, y: 0}
m_AnchorMax: {x: 1, y: 0}
m_AnchoredPosition: {x: 45, y: 108}
m_AnchoredPosition: {x: 42, y: 108}
m_SizeDelta: {x: 42, y: 52}
m_Pivot: {x: 1, y: 0}
--- !u!222 &6915891002358082526
@@ -3246,6 +3246,7 @@ GameObject:
- component: {fileID: 5748471796170483597}
- component: {fileID: 5582651108076499812}
- component: {fileID: 3714912750620550917}
- component: {fileID: 4533906783927863560}
m_Layer: 5
m_Name: Scrollbar Vertical
m_TagString: Untagged
@@ -3358,6 +3359,18 @@ MonoBehaviour:
m_OnValueChanged:
m_PersistentCalls:
m_Calls: []
--- !u!225 &4533906783927863560
CanvasGroup:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6050569855701897417}
m_Enabled: 1
m_Alpha: 0
m_Interactable: 1
m_BlocksRaycasts: 1
m_IgnoreParentGroups: 0
--- !u!114 &1429559311976359905
MonoBehaviour:
m_ObjectHideFlags: 0
@@ -4560,7 +4573,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 0.17254902, g: 0.17254902, b: 0.21960784, a: 1}
m_Color: {r: 0.20784314, g: 0.20784314, b: 0.2627451, a: 1}
m_RaycastTarget: 1
m_Maskable: 1
m_OnCullStateChanged:
@@ -5887,6 +5900,12 @@ GameObject:
type: 3}
m_PrefabInstance: {fileID: 5321188461237024149}
m_PrefabAsset: {fileID: 0}
--- !u!1 &4951052648640690816 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 967434514102783765, guid: 5ee52e0b78bd38244a2b473e2236800c,
type: 3}
m_PrefabInstance: {fileID: 5321188461237024149}
m_PrefabAsset: {fileID: 0}
--- !u!224 &2234182990056195463 stripped
RectTransform:
m_CorrespondingSourceObject: {fileID: 6258245508770672658, guid: 5ee52e0b78bd38244a2b473e2236800c,
@@ -5899,12 +5918,6 @@ GameObject:
type: 3}
m_PrefabInstance: {fileID: 5321188461237024149}
m_PrefabAsset: {fileID: 0}
--- !u!1 &4951052648640690816 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 967434514102783765, guid: 5ee52e0b78bd38244a2b473e2236800c,
type: 3}
m_PrefabInstance: {fileID: 5321188461237024149}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &6073211655158443556
PrefabInstance:
m_ObjectHideFlags: 0
@@ -6044,30 +6057,6 @@ PrefabInstance:
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 5ee52e0b78bd38244a2b473e2236800c, type: 3}
--- !u!1 &5594525415673429112 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 1867831574853112412, guid: 5ee52e0b78bd38244a2b473e2236800c,
type: 3}
m_PrefabInstance: {fileID: 6073211655158443556}
m_PrefabAsset: {fileID: 0}
--- !u!1 &7820744829146851513 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 4089475371085219485, guid: 5ee52e0b78bd38244a2b473e2236800c,
type: 3}
m_PrefabInstance: {fileID: 6073211655158443556}
m_PrefabAsset: {fileID: 0}
--- !u!1 &3980532922793874755 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 7166863393051868007, guid: 5ee52e0b78bd38244a2b473e2236800c,
type: 3}
m_PrefabInstance: {fileID: 6073211655158443556}
m_PrefabAsset: {fileID: 0}
--- !u!1 &6749386026079657654 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 712346121867735186, guid: 5ee52e0b78bd38244a2b473e2236800c,
type: 3}
m_PrefabInstance: {fileID: 6073211655158443556}
m_PrefabAsset: {fileID: 0}
--- !u!224 &185106026378206774 stripped
RectTransform:
m_CorrespondingSourceObject: {fileID: 6258245508770672658, guid: 5ee52e0b78bd38244a2b473e2236800c,
@@ -6086,12 +6075,36 @@ GameObject:
type: 3}
m_PrefabInstance: {fileID: 6073211655158443556}
m_PrefabAsset: {fileID: 0}
--- !u!1 &6749386026079657654 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 712346121867735186, 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 &3980532922793874755 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 7166863393051868007, guid: 5ee52e0b78bd38244a2b473e2236800c,
type: 3}
m_PrefabInstance: {fileID: 6073211655158443556}
m_PrefabAsset: {fileID: 0}
--- !u!1 &7820744829146851513 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 4089475371085219485, guid: 5ee52e0b78bd38244a2b473e2236800c,
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,
@@ -6222,15 +6235,15 @@ 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 &4976321847170018841 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 1827088261433348456, 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}
Assets/Resources/UI/Prefab/Panel/Mobile/RaceDetailModal.prefab
+2 -2
View File
@@ -1655,7 +1655,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 0.13725491, g: 0.13725491, b: 0.1764706, a: 1}
m_Color: {r: 0.13725491, g: 0.13725491, b: 0.1764706, a: 0.8}
m_RaycastTarget: 1
m_Maskable: 1
m_OnCullStateChanged:
@@ -2692,7 +2692,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Texture: {fileID: 2800000, guid: 9a92cba5eb71cb14b96ca87c1cde45a3, type: 3}
m_Texture: {fileID: 2800000, guid: 4214119458c589c409b03681f25e73d8, type: 3}
m_UVRect:
serializedVersion: 2
x: 0
Assets/Resources/UI/Prefab/Panel/Mobile/RaceHomePanel.prefab
+6 -6
View File
@@ -680,7 +680,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: adb30198aa32dd140b5750692dd48104, type: 3}
m_Name:
m_EditorClassIdentifier:
radius: 20
radius: 10
--- !u!114 &3611089692291679606
MonoBehaviour:
m_ObjectHideFlags: 0
@@ -1203,7 +1203,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: adb30198aa32dd140b5750692dd48104, type: 3}
m_Name:
m_EditorClassIdentifier:
radius: 20
radius: 10
--- !u!225 &6903105543186716152
CanvasGroup:
m_ObjectHideFlags: 0
@@ -1345,7 +1345,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: adb30198aa32dd140b5750692dd48104, type: 3}
m_Name:
m_EditorClassIdentifier:
radius: 30
radius: 20
--- !u!114 &1022034391187457486
MonoBehaviour:
m_ObjectHideFlags: 0
@@ -1485,7 +1485,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: 8a1f5dd0a18144c498c99139fcfa3547, type: 3}
m_Sprite: {fileID: 21300000, guid: 426bc972b7c244d40b428c79111a0d76, type: 3}
m_Type: 1
m_PreserveAspect: 0
m_FillCenter: 1
@@ -1569,7 +1569,7 @@ MonoBehaviour:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 9215991903893938157}
m_Enabled: 1
m_Enabled: 0
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
m_Name:
@@ -1598,7 +1598,7 @@ MonoBehaviour:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 9215991903893938157}
m_Enabled: 1
m_Enabled: 0
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 31a19414c41e5ae4aae2af33fee712f6, type: 3}
m_Name:
Assets/Resources/UI/Prefab/Panel/Mobile/RaceListPanel.prefab
+35 -22
View File
@@ -832,8 +832,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 3, y: 0}
m_SizeDelta: {x: -14, y: -20}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1584307428038433365
CanvasRenderer:
@@ -912,10 +912,10 @@ RectTransform:
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0.5}
m_AnchorMax: {x: 1, y: 0.5}
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: 0, y: 390}
m_SizeDelta: {x: 840, y: 390}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1673965681348374010
CanvasRenderer:
@@ -1528,9 +1528,9 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 31, y: 0}
m_AnchoredPosition: {x: 112, y: 0}
m_SizeDelta: {x: -162, y: -20}
m_Pivot: {x: 0.5, y: 0.5}
m_Pivot: {x: 0, y: 0.5}
--- !u!222 &4408462524766711654
CanvasRenderer:
m_ObjectHideFlags: 0
@@ -1617,8 +1617,8 @@ RectTransform:
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_AnchoredPosition: {x: 0, y: -8}
m_SizeDelta: {x: -4, y: -18}
m_Pivot: {x: 0, y: 1}
--- !u!222 &4605362255460975190
CanvasRenderer:
@@ -1720,9 +1720,9 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Padding:
m_Left: 0
m_Left: 10
m_Right: 0
m_Top: 0
m_Top: 2
m_Bottom: 0
m_ChildAlignment: 0
m_StartCorner: 0
@@ -1972,7 +1972,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
r: {x: 30, y: 30, z: 0, w: 0}
rect2props: {x: -0.000022888184, y: -15.000021, z: -39.951534, w: -39.951534}
rect2props: {x: 0.000061035156, y: -14.9999695, z: 257.03333, w: 257.03333}
--- !u!1 &4876623757515401105
GameObject:
m_ObjectHideFlags: 0
@@ -2274,6 +2274,7 @@ GameObject:
- component: {fileID: 6208840624193956598}
- component: {fileID: 5649820887468360938}
- component: {fileID: 4995230873168002437}
- component: {fileID: 371421988027354186}
m_Layer: 5
m_Name: Scrollbar Vertical
m_TagString: Untagged
@@ -2298,8 +2299,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 1, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 6, y: 0}
m_AnchoredPosition: {x: 0, y: -10}
m_SizeDelta: {x: 6, y: -20}
m_Pivot: {x: 1, y: 1}
--- !u!222 &6208840624193956598
CanvasRenderer:
@@ -2386,6 +2387,18 @@ MonoBehaviour:
m_OnValueChanged:
m_PersistentCalls:
m_Calls: []
--- !u!225 &371421988027354186
CanvasGroup:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5636707158863814618}
m_Enabled: 1
m_Alpha: 0
m_Interactable: 1
m_BlocksRaycasts: 1
m_IgnoreParentGroups: 0
--- !u!1 &5948476992245059236
GameObject:
m_ObjectHideFlags: 0
@@ -2556,7 +2569,7 @@ RectTransform:
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 20, y: 20}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1879090066066017084
CanvasRenderer:
@@ -3108,7 +3121,7 @@ RectTransform:
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: -20, y: -20}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &7825229638776794367
GameObject:
@@ -3784,15 +3797,15 @@ PrefabInstance:
m_RemovedComponents:
- {fileID: 829206726517620079, guid: a1999d0576fee6248a9c5a507ae8d10e, type: 3}
m_SourcePrefab: {fileID: 100100000, guid: a1999d0576fee6248a9c5a507ae8d10e, type: 3}
--- !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}
--- !u!1 &7118448401530350837 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 2638424933752433026, guid: a1999d0576fee6248a9c5a507ae8d10e,
type: 3}
m_PrefabInstance: {fileID: 5067779267173090679}
m_PrefabAsset: {fileID: 0}
Assets/Resources/UI/Prefab/Race/Banner/BannerItem-Mobile.prefab
+1 -1
View File
@@ -84,4 +84,4 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: adb30198aa32dd140b5750692dd48104, type: 3}
m_Name:
m_EditorClassIdentifier:
radius: 30
radius: 20
Assets/Resources/UI/Prefab/Race/Mobile/ItemSmall-Mobile.prefab
+17 -17
View File
@@ -323,7 +323,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!224 &6478029046036993396
RectTransform:
m_ObjectHideFlags: 0
@@ -810,9 +810,9 @@ GameObject:
- component: {fileID: 5521075338391914460}
- component: {fileID: 5521075338391914451}
- component: {fileID: 5521075338391914450}
- component: {fileID: 5521075338391914461}
- component: {fileID: 5521075338391914448}
- component: {fileID: 1532717361118433841}
- component: {fileID: 4105564110185391221}
m_Layer: 5
m_Name: ItemSmall-Mobile
m_TagString: Untagged
@@ -882,19 +882,6 @@ MonoBehaviour:
y: 0
width: 1
height: 1
--- !u!114 &5521075338391914461
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5521075338391914463}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: adb30198aa32dd140b5750692dd48104, type: 3}
m_Name:
m_EditorClassIdentifier:
radius: 20
--- !u!114 &5521075338391914448
MonoBehaviour:
m_ObjectHideFlags: 0
@@ -951,6 +938,19 @@ MonoBehaviour:
m_OnClick:
m_PersistentCalls:
m_Calls: []
--- !u!114 &4105564110185391221
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5521075338391914463}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: adb30198aa32dd140b5750692dd48104, type: 3}
m_Name:
m_EditorClassIdentifier:
radius: 10
--- !u!1 &5521075338411426020
GameObject:
m_ObjectHideFlags: 0
@@ -1661,7 +1661,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 0.13725491, g: 0.13725491, b: 0.1764706, a: 1}
m_Color: {r: 0.13725491, g: 0.13725491, b: 0.1764706, a: 0.8}
m_RaycastTarget: 1
m_Maskable: 1
m_OnCullStateChanged:
@@ -2179,7 +2179,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Texture: {fileID: 2800000, guid: 9a92cba5eb71cb14b96ca87c1cde45a3, type: 3}
m_Texture: {fileID: 2800000, guid: 4214119458c589c409b03681f25e73d8, type: 3}
m_UVRect:
serializedVersion: 2
x: 0