1
This commit is contained in:
parent
aa4b8dfd6d
commit
3224cec96f
File diff suppressed because it is too large
Load Diff
@ -13,23 +13,28 @@ MonoBehaviour:
|
|||||||
m_Name: Mobile_Renderer
|
m_Name: Mobile_Renderer
|
||||||
m_EditorClassIdentifier:
|
m_EditorClassIdentifier:
|
||||||
debugShaders:
|
debugShaders:
|
||||||
debugReplacementPS: {fileID: 4800000, guid: cf852408f2e174538bcd9b7fda1c5ae7,
|
debugReplacementPS: {fileID: 4800000, guid: cf852408f2e174538bcd9b7fda1c5ae7, type: 3}
|
||||||
type: 3}
|
|
||||||
hdrDebugViewPS: {fileID: 4800000, guid: 573620ae32aec764abd4d728906d2587, type: 3}
|
hdrDebugViewPS: {fileID: 4800000, guid: 573620ae32aec764abd4d728906d2587, type: 3}
|
||||||
probeVolumeSamplingDebugComputeShader: {fileID: 7200000, guid: 53626a513ea68ce47b59dc1299fe3959,
|
|
||||||
type: 3}
|
|
||||||
probeVolumeResources:
|
|
||||||
probeVolumeDebugShader: {fileID: 0}
|
|
||||||
probeVolumeFragmentationDebugShader: {fileID: 0}
|
|
||||||
probeVolumeOffsetDebugShader: {fileID: 0}
|
|
||||||
probeVolumeSamplingDebugShader: {fileID: 0}
|
|
||||||
probeSamplingDebugMesh: {fileID: 0}
|
|
||||||
probeSamplingDebugTexture: {fileID: 0}
|
|
||||||
probeVolumeBlendStatesCS: {fileID: 0}
|
|
||||||
m_RendererFeatures: []
|
m_RendererFeatures: []
|
||||||
m_RendererFeatureMap:
|
m_RendererFeatureMap:
|
||||||
m_UseNativeRenderPass: 1
|
m_UseNativeRenderPass: 1
|
||||||
postProcessData: {fileID: 11400000, guid: 41439944d30ece34e96484bdb6645b55, type: 2}
|
postProcessData: {fileID: 11400000, guid: 41439944d30ece34e96484bdb6645b55, type: 2}
|
||||||
|
xrSystemData: {fileID: 11400000, guid: 60e1133243b97e347b653163a8c01b64, type: 2}
|
||||||
|
shaders:
|
||||||
|
blitPS: {fileID: 4800000, guid: c17132b1f77d20942aa75f8429c0f8bc, type: 3}
|
||||||
|
copyDepthPS: {fileID: 4800000, guid: d6dae50ee9e1bfa4db75f19f99355220, type: 3}
|
||||||
|
screenSpaceShadowPS: {fileID: 0}
|
||||||
|
samplingPS: {fileID: 4800000, guid: 04c410c9937594faa893a11dceb85f7e, type: 3}
|
||||||
|
stencilDeferredPS: {fileID: 4800000, guid: e9155b26e1bc55942a41e518703fe304, type: 3}
|
||||||
|
fallbackErrorPS: {fileID: 4800000, guid: e6e9a19c3678ded42a3bc431ebef7dbd, type: 3}
|
||||||
|
fallbackLoadingPS: {fileID: 4800000, guid: 7f888aff2ac86494babad1c2c5daeee2, type: 3}
|
||||||
|
materialErrorPS: {fileID: 4800000, guid: 5fd9a8feb75a4b5894c241777f519d4e, type: 3}
|
||||||
|
coreBlitPS: {fileID: 4800000, guid: 93446b5c5339d4f00b85c159e1159b7c, type: 3}
|
||||||
|
coreBlitColorAndDepthPS: {fileID: 4800000, guid: d104b2fc1ca6445babb8e90b0758136b, type: 3}
|
||||||
|
blitHDROverlay: {fileID: 4800000, guid: a89bee29cffa951418fc1e2da94d1959, type: 3}
|
||||||
|
cameraMotionVector: {fileID: 4800000, guid: c56b7e0d4c7cb484e959caeeedae9bbf, type: 3}
|
||||||
|
objectMotionVector: {fileID: 4800000, guid: 7b3ede40266cd49a395def176e1bc486, type: 3}
|
||||||
|
dataDrivenLensFlare: {fileID: 4800000, guid: 6cda457ac28612740adb23da5d39ea92, type: 3}
|
||||||
m_AssetVersion: 2
|
m_AssetVersion: 2
|
||||||
m_OpaqueLayerMask:
|
m_OpaqueLayerMask:
|
||||||
serializedVersion: 2
|
serializedVersion: 2
|
||||||
|
|||||||
8
Client/Assets/Test.meta
Normal file
8
Client/Assets/Test.meta
Normal file
@ -0,0 +1,8 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 120be4f03dcf52a4c827a44807402f14
|
||||||
|
folderAsset: yes
|
||||||
|
DefaultImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
BIN
Client/Assets/Test/GameBase.dll.bytes
Normal file
BIN
Client/Assets/Test/GameBase.dll.bytes
Normal file
Binary file not shown.
7
Client/Assets/Test/GameBase.dll.bytes.meta
Normal file
7
Client/Assets/Test/GameBase.dll.bytes.meta
Normal file
@ -0,0 +1,7 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: fece5a979e9f6ad489f077bad6fb358c
|
||||||
|
TextScriptImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
BIN
Client/Assets/Test/GameBase.pdb.bytes
Normal file
BIN
Client/Assets/Test/GameBase.pdb.bytes
Normal file
Binary file not shown.
7
Client/Assets/Test/GameBase.pdb.bytes.meta
Normal file
7
Client/Assets/Test/GameBase.pdb.bytes.meta
Normal file
@ -0,0 +1,7 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: d7fad1223ee359940a43eccb1814103f
|
||||||
|
TextScriptImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
BIN
Client/Assets/Test/GameLib.dll.bytes
Normal file
BIN
Client/Assets/Test/GameLib.dll.bytes
Normal file
Binary file not shown.
7
Client/Assets/Test/GameLib.dll.bytes.meta
Normal file
7
Client/Assets/Test/GameLib.dll.bytes.meta
Normal file
@ -0,0 +1,7 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 66312dfa5dc7a594fa239d5e23983099
|
||||||
|
TextScriptImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
BIN
Client/Assets/Test/GameLib.pdb.bytes
Normal file
BIN
Client/Assets/Test/GameLib.pdb.bytes
Normal file
Binary file not shown.
7
Client/Assets/Test/GameLib.pdb.bytes.meta
Normal file
7
Client/Assets/Test/GameLib.pdb.bytes.meta
Normal file
@ -0,0 +1,7 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 0be83be7a9ef27d4a98952a568da1bc4
|
||||||
|
TextScriptImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
BIN
Client/Assets/Test/GameLogic.dll.bytes
Normal file
BIN
Client/Assets/Test/GameLogic.dll.bytes
Normal file
Binary file not shown.
7
Client/Assets/Test/GameLogic.dll.bytes.meta
Normal file
7
Client/Assets/Test/GameLogic.dll.bytes.meta
Normal file
@ -0,0 +1,7 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: ca9087bc37b3f8d48b90396b79b283f3
|
||||||
|
TextScriptImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
BIN
Client/Assets/Test/GameLogic.pdb.bytes
Normal file
BIN
Client/Assets/Test/GameLogic.pdb.bytes
Normal file
Binary file not shown.
7
Client/Assets/Test/GameLogic.pdb.bytes.meta
Normal file
7
Client/Assets/Test/GameLogic.pdb.bytes.meta
Normal file
@ -0,0 +1,7 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 200d1a5604e5e984e89a9bf9f4317d22
|
||||||
|
TextScriptImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
BIN
Client/Assets/Test/GameProto.dll.bytes
Normal file
BIN
Client/Assets/Test/GameProto.dll.bytes
Normal file
Binary file not shown.
7
Client/Assets/Test/GameProto.dll.bytes.meta
Normal file
7
Client/Assets/Test/GameProto.dll.bytes.meta
Normal file
@ -0,0 +1,7 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 3bd16e6ed56d37c448334a4fe1a0fec3
|
||||||
|
TextScriptImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
BIN
Client/Assets/Test/GameProto.pdb.bytes
Normal file
BIN
Client/Assets/Test/GameProto.pdb.bytes
Normal file
Binary file not shown.
7
Client/Assets/Test/GameProto.pdb.bytes.meta
Normal file
7
Client/Assets/Test/GameProto.pdb.bytes.meta
Normal file
@ -0,0 +1,7 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 9eb4e0f52fdd98d4dafef1d7c14a07fb
|
||||||
|
TextScriptImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
@ -10,13 +10,11 @@ using UnityEngine.UI;
|
|||||||
public class TestAudioPlay : MonoBehaviour
|
public class TestAudioPlay : MonoBehaviour
|
||||||
{
|
{
|
||||||
public AudioSource audioSource;
|
public AudioSource audioSource;
|
||||||
[SerializeField] private UXHotkeyButton[] hotButtons;
|
|
||||||
|
|
||||||
public UXButton btn;
|
|
||||||
|
|
||||||
public void TestFocus()
|
public void TestFocus()
|
||||||
{
|
{
|
||||||
btn.Focus();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public class UXAuditoHelper : IUXAudioHelper
|
public class UXAuditoHelper : IUXAudioHelper
|
||||||
@ -57,27 +55,10 @@ public class TestAudioPlay : MonoBehaviour
|
|||||||
private void Awake()
|
private void Awake()
|
||||||
{
|
{
|
||||||
UXComponentExtensionsHelper.SetAudioHelper(new UXAuditoHelper(audioSource));
|
UXComponentExtensionsHelper.SetAudioHelper(new UXAuditoHelper(audioSource));
|
||||||
BindHotKeys();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private void OnApplicationQuit()
|
private void OnApplicationQuit()
|
||||||
{
|
{
|
||||||
UnBindHotKeys();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
internal void BindHotKeys()
|
|
||||||
{
|
|
||||||
for (int i = 0; i < hotButtons.Length; i++)
|
|
||||||
{
|
|
||||||
hotButtons[i].BindHotKey();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
internal void UnBindHotKeys()
|
|
||||||
{
|
|
||||||
for (int i = 0; i < hotButtons.Length; i++)
|
|
||||||
{
|
|
||||||
hotButtons[i].UnBindHotKey();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|||||||
@ -1 +1 @@
|
|||||||
Subproject commit 64c8c338c68f696050cbb71028d0663bdc6342f0
|
Subproject commit 551423f09d7f753de9436e9942718f79b81ff081
|
||||||
@ -1288,7 +1288,7 @@ public class UXHierarchyWindow : EditorWindow
|
|||||||
evt.menu.AppendAction("UXButton", a => { UXCreateHelper.CreateUXButton(command); }, a => DropdownMenuAction.Status.Normal);
|
evt.menu.AppendAction("UXButton", a => { UXCreateHelper.CreateUXButton(command); }, a => DropdownMenuAction.Status.Normal);
|
||||||
evt.menu.AppendAction("UXInput Field", a => { UXCreateHelper.CreateUXInputField(command); }, a => DropdownMenuAction.Status.Normal);
|
evt.menu.AppendAction("UXInput Field", a => { UXCreateHelper.CreateUXInputField(command); }, a => DropdownMenuAction.Status.Normal);
|
||||||
evt.menu.AppendAction("UXScrollView", a => { UXCreateHelper.CreateUxRecyclerView(); }, a => DropdownMenuAction.Status.Normal);
|
evt.menu.AppendAction("UXScrollView", a => { UXCreateHelper.CreateUxRecyclerView(); }, a => DropdownMenuAction.Status.Normal);
|
||||||
evt.menu.AppendAction("UXSlider", a => { UXCreateHelper.CreateUXSlider(command); }, a => DropdownMenuAction.Status.Normal);
|
evt.menu.AppendAction("UXSlider", a => { UXCreateHelper.CreateUXToggle(command); }, a => DropdownMenuAction.Status.Normal);
|
||||||
}
|
}
|
||||||
|
|
||||||
private void CreateControlerUIMenu(ContextualMenuPopulateEvent evt, GameObject target)
|
private void CreateControlerUIMenu(ContextualMenuPopulateEvent evt, GameObject target)
|
||||||
|
|||||||
@ -30,10 +30,10 @@ EditorUserSettings:
|
|||||||
value: 54010c54510c5a5f5a0a0973477b0a4414151a2b757925367a7e4a6ab1b66260
|
value: 54010c54510c5a5f5a0a0973477b0a4414151a2b757925367a7e4a6ab1b66260
|
||||||
flags: 0
|
flags: 0
|
||||||
RecentlyUsedSceneGuid-7:
|
RecentlyUsedSceneGuid-7:
|
||||||
value: 50500404540c580d0f0b5e7543725b44424f4c7a7b7c7734747e4f36e4b1676d
|
value: 5a07065703500c59585e0e7748770d44444f4a737d2d7f35787d4f63e0b26668
|
||||||
flags: 0
|
flags: 0
|
||||||
RecentlyUsedSceneGuid-8:
|
RecentlyUsedSceneGuid-8:
|
||||||
value: 5a07065703500c59585e0e7748770d44444f4a737d2d7f35787d4f63e0b26668
|
value: 50500404540c580d0f0b5e7543725b44424f4c7a7b7c7734747e4f36e4b1676d
|
||||||
flags: 0
|
flags: 0
|
||||||
RecentlyUsedSceneGuid-9:
|
RecentlyUsedSceneGuid-9:
|
||||||
value: 015450045700505d0f0a5f2313260a444e164b2e757b76652c2d4d32bab0313a
|
value: 015450045700505d0f0a5f2313260a444e164b2e757b76652c2d4d32bab0313a
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user