Merge branch 'master_develop' into master_local_test
commit
817f6e7191
|
|
@ -103,7 +103,6 @@ AudioMixerSnapshotController:
|
|||
e55c96e0081f0624e96ea39a1682dedb: -50
|
||||
d651f521d1601984b9682a4b91165bc6: 0
|
||||
e05ad82142928624882b52abbc613253: -40.900005
|
||||
24f1aa413e8fd644eab2393fd3846495: 0.0449
|
||||
64b6495189e42084f9eec2923e1652d0: 0.337
|
||||
7700ad51ac9923b4aa834149d1470a5c: 1
|
||||
8288e161ce2785e4c9dacc2e01732073: 0.23288238
|
||||
|
|
@ -114,7 +113,6 @@ AudioMixerSnapshotController:
|
|||
69a853c163368534b9336b17109e7973: 0.1
|
||||
cfe92bc12d009294a9e7e653fa14f046: 0.3
|
||||
b41191d1389ea7a4d8352c41cae2e445: 0
|
||||
68f605d1226b1f24a82441f10f7f79fa: 12283
|
||||
3a16c8e1b02e59c499ea35dc0ba03996: 0
|
||||
ad56c7f187eb91248be7d01970377f73: 7
|
||||
0a121a1205a3d214ca71f89fae7f0981: 22000
|
||||
|
|
@ -127,7 +125,6 @@ AudioMixerSnapshotController:
|
|||
ea3631d2889d9d847b07bd33eec06299: 2
|
||||
8f2c73033f55ffb4aa45f1ed02bf5159: -20
|
||||
2d8ff803b998b444191eeed8a71bc40d: 0.1
|
||||
c3db4c03007e1594b826af7a2448635b: 0.047
|
||||
64deea13be177ff4ba1bdb3773aea935: -15
|
||||
6b771e13170cebe459c0db5013933abb: -80
|
||||
d4cf6d239688db9489e9b08aa3635707: 0
|
||||
|
|
@ -162,8 +159,7 @@ AudioMixerSnapshotController:
|
|||
9ef71325ebb38bb43ab01c15771631bf: 0
|
||||
e3fc962566456814198249747aa429ea: -50
|
||||
13fa3e2575722ad4f8512c8f0a071aa0: 10
|
||||
266c9d3507bd287478652b4a24f500e7: 0
|
||||
d8334f35c9d15a74dbb009232c8bd358: -10000
|
||||
266c9d3507bd287478652b4a24f500e7: 0.025578514
|
||||
18ba4055862295d4784be35911ec149d: -0
|
||||
f5f4c9755f91d4c40b99658083184f28: -55
|
||||
0f686f75b2ebdec4cbbc7eac8f0ed2b7: 0.01
|
||||
|
|
@ -178,7 +174,7 @@ AudioMixerSnapshotController:
|
|||
6a218d6613daca74fba793d8d055e415: -4.560346
|
||||
d6350f7613ed9d74ebaee028d6bed8ea: 0.3
|
||||
8450eb86b7cad57438bfe7ac94268360: 0.1
|
||||
016603c65dacd3440a0e202a6e1afa41: 22000
|
||||
016603c65dacd3440a0e202a6e1afa41: 20000
|
||||
475088c60c0531f41b33cfad444ca8ed: 0
|
||||
9a3b3ad628d574348a5442457dc0ad11: 0.8
|
||||
945931e63ac0bad47a665a8fbca3b493: -60
|
||||
|
|
@ -187,7 +183,6 @@ AudioMixerSnapshotController:
|
|||
cbf53b279f195614d9b265d4e5842edf: -0.3976258
|
||||
c9970e37bbf9e8d46a9afdc772aed464: 10.5
|
||||
5d7f114794b28b642a8684d352483a3a: 0.13552582
|
||||
9d9456774d598f346a5aa1bd1d03b6c8: 6.3
|
||||
420def77f197f0144a4fbcee03b57f14: -60
|
||||
d9fc8697962f0f840ba746829c3ba434: 1.072
|
||||
f289bc9729dea8646b91d2b758094bf0: 0
|
||||
|
|
@ -198,7 +193,6 @@ AudioMixerSnapshotController:
|
|||
6fd37e385186de64aa2d597eeb476df0: 0
|
||||
b03ae058e6ef22242a60695c78572912: 0
|
||||
7d817a688c3aca2409c3bfcd917f3890: 4.648096
|
||||
7e823c68a7b60434d884d25250bb6bcb: -7745
|
||||
adc817a8aab7d1442afcf14905eb193f: 10
|
||||
38479ea820aa45a4da2928b175eca672: -60
|
||||
5888eab8363fe914d8f85413f27db2b4: 10
|
||||
|
|
@ -221,8 +215,6 @@ AudioMixerSnapshotController:
|
|||
a4de831af39174641a0dfc4168b8d024: -60
|
||||
91f2b51a1237a26429c4bc4250fc77ef: 0.1
|
||||
ccdef85a2676025419522775d3abe0d2: -20
|
||||
9672f48a465ad51448f7b9ace5473f8c: 61
|
||||
4a49249abcb6bf644838c108d8eef0f3: -5294
|
||||
6777969a6231ad249b1200a68f2980bb: -20
|
||||
2b3d39aa38890bb4b8d6373849d96b77: 0
|
||||
7e46aada3f7ae56459b18db9b94b83fa: 0
|
||||
|
|
@ -258,7 +250,6 @@ AudioMixerSnapshotController:
|
|||
7b2d806d2dba2e748853338bec2d7223: 0.8
|
||||
eada757d6a31c7f4396f0e9f74296880: -20
|
||||
825f0f9dce48d304eac92a24b07bd81a: 0
|
||||
f635dabda94b6ab4c959c889a035297a: 0.77
|
||||
599551cd07aa8644198f8812feb78fc0: 0.5
|
||||
c1de9ecd35bed7d4b8e82cb0ad8ff2d0: 4.069
|
||||
4a8a04ed9851248479e7b1b3022652ac: -11
|
||||
|
|
@ -341,7 +332,6 @@ AudioMixerGroupController:
|
|||
m_Effects:
|
||||
- {fileID: 244000012286055166}
|
||||
- {fileID: 244884798662947936}
|
||||
- {fileID: 244378609684431738}
|
||||
m_UserColorIndex: 0
|
||||
m_Mute: 0
|
||||
m_Solo: 0
|
||||
|
|
@ -979,48 +969,6 @@ AudioMixerEffectController:
|
|||
m_SendTarget: {fileID: 0}
|
||||
m_EnableWetMix: 0
|
||||
m_Bypass: 0
|
||||
--- !u!244 &244378609684431738
|
||||
AudioMixerEffectController:
|
||||
m_ObjectHideFlags: 3
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_Name:
|
||||
m_EffectID: 633f6e868bcea3f4ab1a94cd4f9865fd
|
||||
m_EffectName: SFX Reverb
|
||||
m_MixLevel: 7a4f60e20c0299044a904765ebc597bd
|
||||
m_Parameters:
|
||||
- m_ParameterName: Dry Level
|
||||
m_GUID: 4a49249abcb6bf644838c108d8eef0f3
|
||||
- m_ParameterName: Room
|
||||
m_GUID: 7e823c68a7b60434d884d25250bb6bcb
|
||||
- m_ParameterName: Room HF
|
||||
m_GUID: 6f6d698c06450434dbe3f51d95df8902
|
||||
- m_ParameterName: Decay Time
|
||||
m_GUID: 9d9456774d598f346a5aa1bd1d03b6c8
|
||||
- m_ParameterName: Decay HF Ratio
|
||||
m_GUID: f635dabda94b6ab4c959c889a035297a
|
||||
- m_ParameterName: Reflections
|
||||
m_GUID: d8334f35c9d15a74dbb009232c8bd358
|
||||
- m_ParameterName: Reflect Delay
|
||||
m_GUID: c3db4c03007e1594b826af7a2448635b
|
||||
- m_ParameterName: Reverb
|
||||
m_GUID: bf00d72b9d75a0947a4cf577bee44a3b
|
||||
- m_ParameterName: Reverb Delay
|
||||
m_GUID: 24f1aa413e8fd644eab2393fd3846495
|
||||
- m_ParameterName: Diffusion
|
||||
m_GUID: 80971aaefba8d91429209428067a3525
|
||||
- m_ParameterName: Density
|
||||
m_GUID: 1a9d62400b3e0f243986b284ee502f15
|
||||
- m_ParameterName: HF Reference
|
||||
m_GUID: 68f605d1226b1f24a82441f10f7f79fa
|
||||
- m_ParameterName: Room LF
|
||||
m_GUID: a5e02acb493135c45ac3d9fcb08f9c8b
|
||||
- m_ParameterName: LF Reference
|
||||
m_GUID: 9672f48a465ad51448f7b9ace5473f8c
|
||||
m_SendTarget: {fileID: 0}
|
||||
m_EnableWetMix: 0
|
||||
m_Bypass: 0
|
||||
--- !u!244 &244415231142600488
|
||||
AudioMixerEffectController:
|
||||
m_ObjectHideFlags: 3
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
|
|
@ -1,5 +1,80 @@
|
|||
%YAML 1.1
|
||||
%TAG !u! tag:unity3d.com,2011:
|
||||
--- !u!1 &584892762679525857
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 1051656819208556112}
|
||||
- component: {fileID: 8743653308438433369}
|
||||
- component: {fileID: 9192249603128165987}
|
||||
m_Layer: 5
|
||||
m_Name: starPre (16)
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 0
|
||||
--- !u!224 &1051656819208556112
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 584892762679525857}
|
||||
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: 2016497424707099067}
|
||||
m_Father: {fileID: 2320031820122894204}
|
||||
m_RootOrder: 9
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 110.139496, y: 1.2465}
|
||||
m_SizeDelta: {x: 32.493, y: 32.493}
|
||||
m_Pivot: {x: 0, y: 1}
|
||||
--- !u!222 &8743653308438433369
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 584892762679525857}
|
||||
m_CullTransparentMesh: 0
|
||||
--- !u!114 &9192249603128165987
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 584892762679525857}
|
||||
m_Enabled: 0
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Material: {fileID: 0}
|
||||
m_Color: {r: 1, g: 1, b: 1, a: 1}
|
||||
m_RaycastTarget: 1
|
||||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
|
||||
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
|
||||
m_Sprite: {fileID: 21300000, guid: 8908080ead3926f4e9e9951397b9e29b, 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
|
||||
--- !u!1 &757563530012435947
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -257,7 +332,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: 58.906994, y: 1.2465}
|
||||
m_AnchoredPosition: {x: 48.660496, y: 1.2465}
|
||||
m_SizeDelta: {x: 32.493, y: 32.493}
|
||||
m_Pivot: {x: 0, y: 1}
|
||||
--- !u!222 &2320031818097329355
|
||||
|
|
@ -332,7 +407,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: 62.160496, y: 1.2465}
|
||||
m_AnchoredPosition: {x: 48.660496, y: 1.2465}
|
||||
m_SizeDelta: {x: 32.493, y: 32.493}
|
||||
m_Pivot: {x: 0, y: 1}
|
||||
--- !u!222 &2320031818242639341
|
||||
|
|
@ -629,7 +704,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: 79.399994, y: 1.2465}
|
||||
m_AnchoredPosition: {x: 69.153496, y: 1.2465}
|
||||
m_SizeDelta: {x: 32.493, y: 32.493}
|
||||
m_Pivot: {x: 0, y: 1}
|
||||
--- !u!222 &2320031818590170636
|
||||
|
|
@ -1070,7 +1145,7 @@ RectTransform:
|
|||
m_Children:
|
||||
- {fileID: 2320031819195525549}
|
||||
m_Father: {fileID: 2320031820122894204}
|
||||
m_RootOrder: 13
|
||||
m_RootOrder: 14
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
|
|
@ -1223,7 +1298,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: 41.667496, y: 1.2465}
|
||||
m_AnchoredPosition: {x: 28.167496, y: 1.2465}
|
||||
m_SizeDelta: {x: 32.493, y: 32.493}
|
||||
m_Pivot: {x: 0, y: 1}
|
||||
--- !u!222 &2320031818902343616
|
||||
|
|
@ -1298,7 +1373,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: 38.413994, y: 1.2465}
|
||||
m_AnchoredPosition: {x: 28.167496, y: 1.2465}
|
||||
m_SizeDelta: {x: 32.493, y: 32.493}
|
||||
m_Pivot: {x: 0, y: 1}
|
||||
--- !u!222 &2320031818921221044
|
||||
|
|
@ -1370,10 +1445,10 @@ RectTransform:
|
|||
m_Father: {fileID: 2320031819818155156}
|
||||
m_RootOrder: 0
|
||||
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_AnchorMin: {x: 0.5, y: 0.5}
|
||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||
m_AnchoredPosition: {x: -1.2, y: 5.15}
|
||||
m_SizeDelta: {x: 50, y: 50}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &2320031819088404997
|
||||
CanvasRenderer:
|
||||
|
|
@ -1447,7 +1522,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: 82.653496, y: 1.2465}
|
||||
m_AnchoredPosition: {x: 69.153496, y: 1.2465}
|
||||
m_SizeDelta: {x: 32.493, y: 32.493}
|
||||
m_Pivot: {x: 0, y: 1}
|
||||
--- !u!222 &2320031819123426389
|
||||
|
|
@ -1670,7 +1745,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: 123.639496, y: 1.2465}
|
||||
m_AnchoredPosition: {x: 110.139496, y: 1.2465}
|
||||
m_SizeDelta: {x: 32.493, y: 32.493}
|
||||
m_Pivot: {x: 0, y: 1}
|
||||
--- !u!222 &2320031819291926011
|
||||
|
|
@ -2123,7 +2198,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: 103.1465, y: 1.2465}
|
||||
m_AnchoredPosition: {x: 89.6465, y: 1.2465}
|
||||
m_SizeDelta: {x: 32.493, y: 32.493}
|
||||
m_Pivot: {x: 0, y: 1}
|
||||
--- !u!222 &2320031819610280430
|
||||
|
|
@ -2270,7 +2345,7 @@ RectTransform:
|
|||
m_Children:
|
||||
- {fileID: 2320031820207909310}
|
||||
m_Father: {fileID: 2320031820122894204}
|
||||
m_RootOrder: 12
|
||||
m_RootOrder: 13
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
|
|
@ -2345,7 +2420,7 @@ RectTransform:
|
|||
m_Children:
|
||||
- {fileID: 2320031819916146513}
|
||||
m_Father: {fileID: 2320031820122894204}
|
||||
m_RootOrder: 10
|
||||
m_RootOrder: 11
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
|
|
@ -2420,12 +2495,12 @@ RectTransform:
|
|||
m_Children:
|
||||
- {fileID: 2320031819088404999}
|
||||
m_Father: {fileID: 2320031820122894204}
|
||||
m_RootOrder: 9
|
||||
m_RootOrder: 10
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 60.822495, y: 9.577499}
|
||||
m_SizeDelta: {x: 49.155, y: 49.155}
|
||||
m_AnchoredPosition: {x: 45.399994, y: 25}
|
||||
m_SizeDelta: {x: 80, y: 80}
|
||||
m_Pivot: {x: 0, y: 1}
|
||||
--- !u!222 &2320031819818155162
|
||||
CanvasRenderer:
|
||||
|
|
@ -2442,7 +2517,7 @@ MonoBehaviour:
|
|||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 2320031819818155157}
|
||||
m_Enabled: 0
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
|
||||
m_Name:
|
||||
|
|
@ -2455,7 +2530,7 @@ MonoBehaviour:
|
|||
m_Calls: []
|
||||
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
|
||||
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
|
||||
m_Sprite: {fileID: 21300000, guid: abae95ba31b5b5a4fa83a82d0c56db63, type: 3}
|
||||
m_Sprite: {fileID: 21300000, guid: 65d9f3e687e9f194cbbf7570d02020b6, type: 3}
|
||||
m_Type: 0
|
||||
m_PreserveAspect: 0
|
||||
m_FillCenter: 1
|
||||
|
|
@ -2724,6 +2799,7 @@ RectTransform:
|
|||
- {fileID: 2320031818242639343}
|
||||
- {fileID: 2320031819123426391}
|
||||
- {fileID: 2320031819610280424}
|
||||
- {fileID: 1051656819208556112}
|
||||
- {fileID: 2320031819818155156}
|
||||
- {fileID: 2320031819795124046}
|
||||
- {fileID: 2320031820163869943}
|
||||
|
|
@ -2800,7 +2876,7 @@ RectTransform:
|
|||
m_Children:
|
||||
- {fileID: 2320031818794305969}
|
||||
m_Father: {fileID: 2320031820122894204}
|
||||
m_RootOrder: 14
|
||||
m_RootOrder: 15
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
|
|
@ -2875,7 +2951,7 @@ RectTransform:
|
|||
m_Children:
|
||||
- {fileID: 2320031818352649172}
|
||||
m_Father: {fileID: 2320031820122894204}
|
||||
m_RootOrder: 11
|
||||
m_RootOrder: 12
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
|
|
@ -3028,7 +3104,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: 99.89299, y: 1.2465}
|
||||
m_AnchoredPosition: {x: 89.6465, y: 1.2465}
|
||||
m_SizeDelta: {x: 32.493, y: 32.493}
|
||||
m_Pivot: {x: 0, y: 1}
|
||||
--- !u!222 &2320031820211446152
|
||||
|
|
@ -4040,3 +4116,77 @@ MonoBehaviour:
|
|||
m_Script: {fileID: -146154839, guid: f70555f144d8491a825f0804e09c671c, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
--- !u!1 &9020638000973603085
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 2016497424707099067}
|
||||
- component: {fileID: 5977624225239214421}
|
||||
- component: {fileID: 1868225740036272686}
|
||||
m_Layer: 5
|
||||
m_Name: star
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &2016497424707099067
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 9020638000973603085}
|
||||
m_LocalRotation: {x: 0, y: 0, z: -0.13052624, w: 0.9914449}
|
||||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_Children: []
|
||||
m_Father: {fileID: 1051656819208556112}
|
||||
m_RootOrder: 0
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: -15}
|
||||
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: 25, y: 25}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &5977624225239214421
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 9020638000973603085}
|
||||
m_CullTransparentMesh: 0
|
||||
--- !u!114 &1868225740036272686
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 9020638000973603085}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Material: {fileID: 0}
|
||||
m_Color: {r: 1, g: 1, b: 1, a: 1}
|
||||
m_RaycastTarget: 1
|
||||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
|
||||
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
|
||||
m_Sprite: {fileID: 21300000, guid: 530bdd8705cf0c841b413c2c589ac956, 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
|
||||
|
|
|
|||
|
|
@ -438,7 +438,7 @@ function SetCardStars(starGrid, star)
|
|||
starGrid.transform:GetChild(5 + i - 1).gameObject:SetActive(true)
|
||||
end
|
||||
elseif star > 9 then
|
||||
starGrid.transform:GetChild(star - 1).gameObject:SetActive(true)
|
||||
starGrid.transform:GetChild(star).gameObject:SetActive(true)
|
||||
end
|
||||
end
|
||||
-- 在给定节点下加载预设, 返回实例化的预设
|
||||
|
|
|
|||
|
|
@ -279,7 +279,11 @@ function this.BtnClick(id)
|
|||
PopupTipPanel.ShowTip(Language[10327])
|
||||
return
|
||||
end
|
||||
if ActTimeCtrlManager.SingleFuncState(id) then
|
||||
UIManager.OpenPanel(UIName.GuildCarDelayMainPanel)
|
||||
else
|
||||
PopupTipPanel.ShowTip(ActTimeCtrlManager.GetFuncTip(id))
|
||||
end
|
||||
elseif id == FUNCTION_OPEN_TYPE.TRIAL then
|
||||
if ActTimeCtrlManager.SingleFuncState(id) then
|
||||
CarbonManager.difficulty = 2
|
||||
|
|
|
|||
|
|
@ -30,7 +30,8 @@ function this.Initialize()
|
|||
this.CalibrateTime(time)
|
||||
end
|
||||
end)
|
||||
|
||||
-- 尝试触发 安装事件(怀疑安装事件是在第一次触发track时触发的)
|
||||
this.Track("init")
|
||||
end
|
||||
|
||||
-- 校对时间
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@ function this:InitComponent(gameObject)
|
|||
--滚动条根节点
|
||||
this.root = Util.GetGameObject(gameObject, "Root")
|
||||
for i = 1, 6 do
|
||||
heroListGo[i] = Util.GetGameObject(gameObject, "RoleGrid/Bg"..i.."/Hero1")
|
||||
heroListGo[i] = Util.GetGameObject(gameObject, "RoleGrid/Bg"..i.."/Hero"..i)
|
||||
end
|
||||
this.backBtn=Util.GetGameObject(gameObject,"BackBtn")
|
||||
end
|
||||
|
|
|
|||
Binary file not shown.
Binary file not shown.
Loading…
Reference in New Issue