*:修复了输入系统与Fungus插件冲突的问题
This commit is contained in:
parent
6b194d05f7
commit
78aa22c3e2
8
Assets/Adaptive Performance.meta
Normal file
8
Assets/Adaptive Performance.meta
Normal file
@ -0,0 +1,8 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: f9f8caaf5133afd49b75b66342f2ecbe
|
||||||
|
folderAsset: yes
|
||||||
|
DefaultImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
@ -0,0 +1,106 @@
|
|||||||
|
%YAML 1.1
|
||||||
|
%TAG !u! tag:unity3d.com,2011:
|
||||||
|
--- !u!114 &-5700492590575048512
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 2
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 0}
|
||||||
|
m_Enabled: 1
|
||||||
|
m_EditorHideFlags: 0
|
||||||
|
m_Script: {fileID: 11500000, guid: 179fc3111e144bc4688dca4038b3265d, type: 3}
|
||||||
|
m_Name: iPhone Settings
|
||||||
|
m_EditorClassIdentifier:
|
||||||
|
m_LoaderManagerInstance: {fileID: 4466775297096079749}
|
||||||
|
m_InitManagerOnStart: 1
|
||||||
|
--- !u!114 &-3731449095792271595
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 2
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 0}
|
||||||
|
m_Enabled: 1
|
||||||
|
m_EditorHideFlags: 0
|
||||||
|
m_Script: {fileID: 11500000, guid: 536372c49e1ca914d822849d36de938c, type: 3}
|
||||||
|
m_Name: Standalone Providers
|
||||||
|
m_EditorClassIdentifier:
|
||||||
|
m_AutomaticLoading: 0
|
||||||
|
m_AutomaticRunning: 0
|
||||||
|
m_Loaders: []
|
||||||
|
--- !u!114 &-233813179328996068
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 2
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 0}
|
||||||
|
m_Enabled: 1
|
||||||
|
m_EditorHideFlags: 0
|
||||||
|
m_Script: {fileID: 11500000, guid: 179fc3111e144bc4688dca4038b3265d, type: 3}
|
||||||
|
m_Name: Standalone Settings
|
||||||
|
m_EditorClassIdentifier:
|
||||||
|
m_LoaderManagerInstance: {fileID: -3731449095792271595}
|
||||||
|
m_InitManagerOnStart: 1
|
||||||
|
--- !u!114 &11400000
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 2
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 0}
|
||||||
|
m_Enabled: 1
|
||||||
|
m_EditorHideFlags: 0
|
||||||
|
m_Script: {fileID: 11500000, guid: cb0ece14d1f711a4fb9325ca819dee95, type: 3}
|
||||||
|
m_Name: AdaptivePerformanceGeneralSettings
|
||||||
|
m_EditorClassIdentifier:
|
||||||
|
Keys: 010000000400000007000000
|
||||||
|
Values:
|
||||||
|
- {fileID: -233813179328996068}
|
||||||
|
- {fileID: -5700492590575048512}
|
||||||
|
- {fileID: 2116847326264649047}
|
||||||
|
--- !u!114 &2116847326264649047
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 2
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 0}
|
||||||
|
m_Enabled: 1
|
||||||
|
m_EditorHideFlags: 0
|
||||||
|
m_Script: {fileID: 11500000, guid: 179fc3111e144bc4688dca4038b3265d, type: 3}
|
||||||
|
m_Name: Android Settings
|
||||||
|
m_EditorClassIdentifier:
|
||||||
|
m_LoaderManagerInstance: {fileID: 2230240768168764464}
|
||||||
|
m_InitManagerOnStart: 1
|
||||||
|
--- !u!114 &2230240768168764464
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 2
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 0}
|
||||||
|
m_Enabled: 1
|
||||||
|
m_EditorHideFlags: 0
|
||||||
|
m_Script: {fileID: 11500000, guid: 536372c49e1ca914d822849d36de938c, type: 3}
|
||||||
|
m_Name: Android Providers
|
||||||
|
m_EditorClassIdentifier:
|
||||||
|
m_AutomaticLoading: 0
|
||||||
|
m_AutomaticRunning: 0
|
||||||
|
m_Loaders: []
|
||||||
|
--- !u!114 &4466775297096079749
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 2
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 0}
|
||||||
|
m_Enabled: 1
|
||||||
|
m_EditorHideFlags: 0
|
||||||
|
m_Script: {fileID: 11500000, guid: 536372c49e1ca914d822849d36de938c, type: 3}
|
||||||
|
m_Name: iPhone Providers
|
||||||
|
m_EditorClassIdentifier:
|
||||||
|
m_AutomaticLoading: 0
|
||||||
|
m_AutomaticRunning: 0
|
||||||
|
m_Loaders: []
|
@ -0,0 +1,8 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: c904ac9773b374d419329ca1a0f380ac
|
||||||
|
NativeFormatImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
mainObjectFileID: 11400000
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
8
Assets/Adaptive Performance/Settings.meta
Normal file
8
Assets/Adaptive Performance/Settings.meta
Normal file
@ -0,0 +1,8 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 3f992aee61d74ea4099853188306afac
|
||||||
|
folderAsset: yes
|
||||||
|
DefaultImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
@ -0,0 +1,260 @@
|
|||||||
|
%YAML 1.1
|
||||||
|
%TAG !u! tag:unity3d.com,2011:
|
||||||
|
--- !u!114 &11400000
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 2
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 0}
|
||||||
|
m_Enabled: 1
|
||||||
|
m_EditorHideFlags: 0
|
||||||
|
m_Script: {fileID: 11500000, guid: b592865877cb54284a5d1d88aec9cfbb, type: 3}
|
||||||
|
m_Name: Simulator Provider Settings
|
||||||
|
m_EditorClassIdentifier:
|
||||||
|
m_Logging: 1
|
||||||
|
m_AutomaticPerformanceModeEnabled: 1
|
||||||
|
m_StatsLoggingFrequencyInFrames: 50
|
||||||
|
m_IndexerSettings:
|
||||||
|
m_Active: 1
|
||||||
|
m_ThermalActionDelay: 10
|
||||||
|
m_PerformanceActionDelay: 4
|
||||||
|
m_ScalerSettings:
|
||||||
|
m_AdaptiveFramerate:
|
||||||
|
m_Name: Adaptive Framerate
|
||||||
|
m_Enabled: 0
|
||||||
|
m_Scale: 1
|
||||||
|
m_VisualImpact: 2
|
||||||
|
m_Target: 7
|
||||||
|
m_MaxLevel: 45
|
||||||
|
m_MinBound: 15
|
||||||
|
m_MaxBound: 60
|
||||||
|
m_AdaptiveResolution:
|
||||||
|
m_Name: Adaptive Resolution
|
||||||
|
m_Enabled: 0
|
||||||
|
m_Scale: 1
|
||||||
|
m_VisualImpact: 0
|
||||||
|
m_Target: 6
|
||||||
|
m_MaxLevel: 9
|
||||||
|
m_MinBound: 0.5
|
||||||
|
m_MaxBound: 1
|
||||||
|
m_AdaptiveBatching:
|
||||||
|
m_Name: Adaptive Batching
|
||||||
|
m_Enabled: 0
|
||||||
|
m_Scale: 1
|
||||||
|
m_VisualImpact: 1
|
||||||
|
m_Target: 1
|
||||||
|
m_MaxLevel: 1
|
||||||
|
m_MinBound: 0
|
||||||
|
m_MaxBound: 1
|
||||||
|
m_AdaptiveLOD:
|
||||||
|
m_Name: Adaptive LOD
|
||||||
|
m_Enabled: 0
|
||||||
|
m_Scale: 1
|
||||||
|
m_VisualImpact: 2
|
||||||
|
m_Target: 2
|
||||||
|
m_MaxLevel: 3
|
||||||
|
m_MinBound: 0.4
|
||||||
|
m_MaxBound: 1
|
||||||
|
m_AdaptiveLut:
|
||||||
|
m_Name: Adaptive Lut
|
||||||
|
m_Enabled: 0
|
||||||
|
m_Scale: 1
|
||||||
|
m_VisualImpact: 1
|
||||||
|
m_Target: 3
|
||||||
|
m_MaxLevel: 1
|
||||||
|
m_MinBound: 0
|
||||||
|
m_MaxBound: 1
|
||||||
|
m_AdaptiveMSAA:
|
||||||
|
m_Name: Adaptive MSAA
|
||||||
|
m_Enabled: 0
|
||||||
|
m_Scale: 1
|
||||||
|
m_VisualImpact: 1
|
||||||
|
m_Target: 6
|
||||||
|
m_MaxLevel: 2
|
||||||
|
m_MinBound: 0
|
||||||
|
m_MaxBound: 1
|
||||||
|
m_AdaptiveShadowCascade:
|
||||||
|
m_Name: Adaptive Shadow Cascade
|
||||||
|
m_Enabled: 0
|
||||||
|
m_Scale: 1
|
||||||
|
m_VisualImpact: 1
|
||||||
|
m_Target: 3
|
||||||
|
m_MaxLevel: 2
|
||||||
|
m_MinBound: 0
|
||||||
|
m_MaxBound: 1
|
||||||
|
m_AdaptiveShadowDistance:
|
||||||
|
m_Name: Adaptive Shadow Distance
|
||||||
|
m_Enabled: 0
|
||||||
|
m_Scale: 1
|
||||||
|
m_VisualImpact: 0
|
||||||
|
m_Target: 2
|
||||||
|
m_MaxLevel: 3
|
||||||
|
m_MinBound: 0.15
|
||||||
|
m_MaxBound: 1
|
||||||
|
m_AdaptiveShadowmapResolution:
|
||||||
|
m_Name: Adaptive Shadowmap Resolution
|
||||||
|
m_Enabled: 0
|
||||||
|
m_Scale: 1
|
||||||
|
m_VisualImpact: 0
|
||||||
|
m_Target: 2
|
||||||
|
m_MaxLevel: 3
|
||||||
|
m_MinBound: 0.15
|
||||||
|
m_MaxBound: 1
|
||||||
|
m_AdaptiveShadowQuality:
|
||||||
|
m_Name: Adaptive Shadow Quality
|
||||||
|
m_Enabled: 0
|
||||||
|
m_Scale: 1
|
||||||
|
m_VisualImpact: 2
|
||||||
|
m_Target: 3
|
||||||
|
m_MaxLevel: 3
|
||||||
|
m_MinBound: 0
|
||||||
|
m_MaxBound: 1
|
||||||
|
m_AdaptiveSorting:
|
||||||
|
m_Name: Adaptive Sorting
|
||||||
|
m_Enabled: 0
|
||||||
|
m_Scale: 1
|
||||||
|
m_VisualImpact: 1
|
||||||
|
m_Target: 1
|
||||||
|
m_MaxLevel: 1
|
||||||
|
m_MinBound: 0
|
||||||
|
m_MaxBound: 1
|
||||||
|
m_AdaptiveTransparency:
|
||||||
|
m_Name: Adaptive Transparency
|
||||||
|
m_Enabled: 0
|
||||||
|
m_Scale: 1
|
||||||
|
m_VisualImpact: 2
|
||||||
|
m_Target: 2
|
||||||
|
m_MaxLevel: 1
|
||||||
|
m_MinBound: 0
|
||||||
|
m_MaxBound: 1
|
||||||
|
m_AdaptiveViewDistance:
|
||||||
|
m_Name: Adaptive View Distance
|
||||||
|
m_Enabled: 0
|
||||||
|
m_Scale: 1
|
||||||
|
m_VisualImpact: 2
|
||||||
|
m_Target: 2
|
||||||
|
m_MaxLevel: 40
|
||||||
|
m_MinBound: 50
|
||||||
|
m_MaxBound: 1000
|
||||||
|
m_scalerProfileList:
|
||||||
|
- m_AdaptiveFramerate:
|
||||||
|
m_Name: Adaptive Framerate
|
||||||
|
m_Enabled: 0
|
||||||
|
m_Scale: 1
|
||||||
|
m_VisualImpact: 2
|
||||||
|
m_Target: 7
|
||||||
|
m_MaxLevel: 45
|
||||||
|
m_MinBound: 15
|
||||||
|
m_MaxBound: 60
|
||||||
|
m_AdaptiveResolution:
|
||||||
|
m_Name: Adaptive Resolution
|
||||||
|
m_Enabled: 0
|
||||||
|
m_Scale: 1
|
||||||
|
m_VisualImpact: 0
|
||||||
|
m_Target: 6
|
||||||
|
m_MaxLevel: 9
|
||||||
|
m_MinBound: 0.5
|
||||||
|
m_MaxBound: 1
|
||||||
|
m_AdaptiveBatching:
|
||||||
|
m_Name: Adaptive Batching
|
||||||
|
m_Enabled: 0
|
||||||
|
m_Scale: 1
|
||||||
|
m_VisualImpact: 1
|
||||||
|
m_Target: 1
|
||||||
|
m_MaxLevel: 1
|
||||||
|
m_MinBound: 0
|
||||||
|
m_MaxBound: 1
|
||||||
|
m_AdaptiveLOD:
|
||||||
|
m_Name: Adaptive LOD
|
||||||
|
m_Enabled: 0
|
||||||
|
m_Scale: 1
|
||||||
|
m_VisualImpact: 2
|
||||||
|
m_Target: 2
|
||||||
|
m_MaxLevel: 3
|
||||||
|
m_MinBound: 0.4
|
||||||
|
m_MaxBound: 1
|
||||||
|
m_AdaptiveLut:
|
||||||
|
m_Name: Adaptive Lut
|
||||||
|
m_Enabled: 0
|
||||||
|
m_Scale: 1
|
||||||
|
m_VisualImpact: 1
|
||||||
|
m_Target: 3
|
||||||
|
m_MaxLevel: 1
|
||||||
|
m_MinBound: 0
|
||||||
|
m_MaxBound: 1
|
||||||
|
m_AdaptiveMSAA:
|
||||||
|
m_Name: Adaptive MSAA
|
||||||
|
m_Enabled: 0
|
||||||
|
m_Scale: 1
|
||||||
|
m_VisualImpact: 1
|
||||||
|
m_Target: 6
|
||||||
|
m_MaxLevel: 2
|
||||||
|
m_MinBound: 0
|
||||||
|
m_MaxBound: 1
|
||||||
|
m_AdaptiveShadowCascade:
|
||||||
|
m_Name: Adaptive Shadow Cascade
|
||||||
|
m_Enabled: 0
|
||||||
|
m_Scale: 1
|
||||||
|
m_VisualImpact: 1
|
||||||
|
m_Target: 3
|
||||||
|
m_MaxLevel: 2
|
||||||
|
m_MinBound: 0
|
||||||
|
m_MaxBound: 1
|
||||||
|
m_AdaptiveShadowDistance:
|
||||||
|
m_Name: Adaptive Shadow Distance
|
||||||
|
m_Enabled: 0
|
||||||
|
m_Scale: 1
|
||||||
|
m_VisualImpact: 0
|
||||||
|
m_Target: 2
|
||||||
|
m_MaxLevel: 3
|
||||||
|
m_MinBound: 0.15
|
||||||
|
m_MaxBound: 1
|
||||||
|
m_AdaptiveShadowmapResolution:
|
||||||
|
m_Name: Adaptive Shadowmap Resolution
|
||||||
|
m_Enabled: 0
|
||||||
|
m_Scale: 1
|
||||||
|
m_VisualImpact: 0
|
||||||
|
m_Target: 2
|
||||||
|
m_MaxLevel: 3
|
||||||
|
m_MinBound: 0.15
|
||||||
|
m_MaxBound: 1
|
||||||
|
m_AdaptiveShadowQuality:
|
||||||
|
m_Name: Adaptive Shadow Quality
|
||||||
|
m_Enabled: 0
|
||||||
|
m_Scale: 1
|
||||||
|
m_VisualImpact: 2
|
||||||
|
m_Target: 3
|
||||||
|
m_MaxLevel: 3
|
||||||
|
m_MinBound: 0
|
||||||
|
m_MaxBound: 1
|
||||||
|
m_AdaptiveSorting:
|
||||||
|
m_Name: Adaptive Sorting
|
||||||
|
m_Enabled: 0
|
||||||
|
m_Scale: 1
|
||||||
|
m_VisualImpact: 1
|
||||||
|
m_Target: 1
|
||||||
|
m_MaxLevel: 1
|
||||||
|
m_MinBound: 0
|
||||||
|
m_MaxBound: 1
|
||||||
|
m_AdaptiveTransparency:
|
||||||
|
m_Name: Adaptive Transparency
|
||||||
|
m_Enabled: 0
|
||||||
|
m_Scale: 1
|
||||||
|
m_VisualImpact: 2
|
||||||
|
m_Target: 2
|
||||||
|
m_MaxLevel: 1
|
||||||
|
m_MinBound: 0
|
||||||
|
m_MaxBound: 1
|
||||||
|
m_AdaptiveViewDistance:
|
||||||
|
m_Name: Adaptive View Distance
|
||||||
|
m_Enabled: 0
|
||||||
|
m_Scale: 1
|
||||||
|
m_VisualImpact: 2
|
||||||
|
m_Target: 2
|
||||||
|
m_MaxLevel: 40
|
||||||
|
m_MinBound: 50
|
||||||
|
m_MaxBound: 1000
|
||||||
|
m_Name: Default Scaler Profile
|
||||||
|
m_DefaultScalerProfilerIndex: 0
|
||||||
|
k_AssetVersion: 2
|
@ -0,0 +1,8 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: ad690714d07fc1a44849fae3ac890474
|
||||||
|
NativeFormatImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
mainObjectFileID: 11400000
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
@ -8,7 +8,7 @@ using UnityEngine;
|
|||||||
#if true // UI_MARKER
|
#if true // UI_MARKER
|
||||||
using UnityEngine.UI;
|
using UnityEngine.UI;
|
||||||
#endif
|
#endif
|
||||||
#if true // TEXTMESHPRO_MARKER
|
#if false // TEXTMESHPRO_MARKER
|
||||||
using TMPro;
|
using TMPro;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
@ -253,7 +253,7 @@ namespace DG.Tweening
|
|||||||
tween = ((tk2dBaseSprite)target).DOColor(endValueColor, duration);
|
tween = ((tk2dBaseSprite)target).DOColor(endValueColor, duration);
|
||||||
break;
|
break;
|
||||||
#endif
|
#endif
|
||||||
#if true // TEXTMESHPRO_MARKER
|
#if false // TEXTMESHPRO_MARKER
|
||||||
case TargetType.TextMeshProUGUI:
|
case TargetType.TextMeshProUGUI:
|
||||||
tween = ((TextMeshProUGUI)target).DOColor(endValueColor, duration);
|
tween = ((TextMeshProUGUI)target).DOColor(endValueColor, duration);
|
||||||
break;
|
break;
|
||||||
@ -296,7 +296,7 @@ namespace DG.Tweening
|
|||||||
tween = ((tk2dBaseSprite)target).DOFade(endValueFloat, duration);
|
tween = ((tk2dBaseSprite)target).DOFade(endValueFloat, duration);
|
||||||
break;
|
break;
|
||||||
#endif
|
#endif
|
||||||
#if true // TEXTMESHPRO_MARKER
|
#if false // TEXTMESHPRO_MARKER
|
||||||
case TargetType.TextMeshProUGUI:
|
case TargetType.TextMeshProUGUI:
|
||||||
tween = ((TextMeshProUGUI)target).DOFade(endValueFloat, duration);
|
tween = ((TextMeshProUGUI)target).DOFade(endValueFloat, duration);
|
||||||
break;
|
break;
|
||||||
@ -321,7 +321,7 @@ namespace DG.Tweening
|
|||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
#if true // TEXTMESHPRO_MARKER
|
#if false // TEXTMESHPRO_MARKER
|
||||||
switch (targetType) {
|
switch (targetType) {
|
||||||
case TargetType.TextMeshProUGUI:
|
case TargetType.TextMeshProUGUI:
|
||||||
tween = ((TextMeshProUGUI)target).DOText(endValueString, duration, optionalBool0, optionalScrambleMode, optionalString);
|
tween = ((TextMeshProUGUI)target).DOText(endValueString, duration, optionalBool0, optionalScrambleMode, optionalString);
|
||||||
|
@ -4,7 +4,7 @@
|
|||||||
// License Copyright (c) Daniele Giardini.
|
// License Copyright (c) Daniele Giardini.
|
||||||
// This work is subject to the terms at http://dotween.demigiant.com/license.php
|
// This work is subject to the terms at http://dotween.demigiant.com/license.php
|
||||||
|
|
||||||
#if true // MODULE_MARKER
|
#if false // MODULE_MARKER
|
||||||
using UnityEngine;
|
using UnityEngine;
|
||||||
using TMPro;
|
using TMPro;
|
||||||
|
|
||||||
|
@ -14,7 +14,7 @@ using UnityEngine;
|
|||||||
#if true // UI_MARKER
|
#if true // UI_MARKER
|
||||||
using UnityEngine.UI;
|
using UnityEngine.UI;
|
||||||
#endif
|
#endif
|
||||||
#if true // TEXTMESHPRO_MARKER
|
#if false // TEXTMESHPRO_MARKER
|
||||||
using TMPro;
|
using TMPro;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
@ -118,7 +118,7 @@ namespace DG.DOTweenEditor
|
|||||||
{ DOTweenAnimationType.Text, new[] { typeof(tk2dTextMesh) } }
|
{ DOTweenAnimationType.Text, new[] { typeof(tk2dTextMesh) } }
|
||||||
};
|
};
|
||||||
#endif
|
#endif
|
||||||
#if true // TEXTMESHPRO_MARKER
|
#if false // TEXTMESHPRO_MARKER
|
||||||
static readonly Dictionary<DOTweenAnimationType, Type[]> _TMPAnimationTypeToComponent = new Dictionary<DOTweenAnimationType, Type[]>() {
|
static readonly Dictionary<DOTweenAnimationType, Type[]> _TMPAnimationTypeToComponent = new Dictionary<DOTweenAnimationType, Type[]>() {
|
||||||
{ DOTweenAnimationType.Color, new[] { typeof(TextMeshPro), typeof(TextMeshProUGUI) } },
|
{ DOTweenAnimationType.Color, new[] { typeof(TextMeshPro), typeof(TextMeshProUGUI) } },
|
||||||
{ DOTweenAnimationType.Fade, new[] { typeof(TextMeshPro), typeof(TextMeshProUGUI) } },
|
{ DOTweenAnimationType.Fade, new[] { typeof(TextMeshPro), typeof(TextMeshProUGUI) } },
|
||||||
@ -138,7 +138,7 @@ namespace DG.DOTweenEditor
|
|||||||
#if false // TK2D_MARKER
|
#if false // TK2D_MARKER
|
||||||
"Text",
|
"Text",
|
||||||
#endif
|
#endif
|
||||||
#if true // TEXTMESHPRO_MARKER
|
#if false // TEXTMESHPRO_MARKER
|
||||||
"Text",
|
"Text",
|
||||||
#endif
|
#endif
|
||||||
#if true // UI_MARKER
|
#if true // UI_MARKER
|
||||||
@ -580,7 +580,7 @@ namespace DG.DOTweenEditor
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
#if true // TEXTMESHPRO_MARKER
|
#if false // TEXTMESHPRO_MARKER
|
||||||
if (_TMPAnimationTypeToComponent.ContainsKey(_src.animationType)) {
|
if (_TMPAnimationTypeToComponent.ContainsKey(_src.animationType)) {
|
||||||
foreach (Type t in _TMPAnimationTypeToComponent[_src.animationType]) {
|
foreach (Type t in _TMPAnimationTypeToComponent[_src.animationType]) {
|
||||||
srcTarget = targetGO.GetComponent(t);
|
srcTarget = targetGO.GetComponent(t);
|
||||||
|
26
Assets/InputSystem.inputsettings.asset
Normal file
26
Assets/InputSystem.inputsettings.asset
Normal file
@ -0,0 +1,26 @@
|
|||||||
|
%YAML 1.1
|
||||||
|
%TAG !u! tag:unity3d.com,2011:
|
||||||
|
--- !u!114 &11400000
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 0}
|
||||||
|
m_Enabled: 1
|
||||||
|
m_EditorHideFlags: 0
|
||||||
|
m_Script: {fileID: 11500000, guid: c46f07b5ed07e4e92aa78254188d3d10, type: 3}
|
||||||
|
m_Name: InputSystem.inputsettings
|
||||||
|
m_EditorClassIdentifier:
|
||||||
|
m_SupportedDevices: []
|
||||||
|
m_UpdateMode: 1
|
||||||
|
m_CompensateForScreenOrientation: 1
|
||||||
|
m_FilterNoiseOnCurrent: 0
|
||||||
|
m_DefaultDeadzoneMin: 0.125
|
||||||
|
m_DefaultDeadzoneMax: 0.925
|
||||||
|
m_DefaultButtonPressPoint: 0.5
|
||||||
|
m_DefaultTapTime: 0.2
|
||||||
|
m_DefaultSlowTapTime: 0.5
|
||||||
|
m_DefaultHoldTime: 0.4
|
||||||
|
m_TapRadius: 5
|
||||||
|
m_MultiTapDelayTime: 0.75
|
8
Assets/InputSystem.inputsettings.asset.meta
Normal file
8
Assets/InputSystem.inputsettings.asset.meta
Normal file
@ -0,0 +1,8 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 380cc78eca6b50e488c31a08df51ea79
|
||||||
|
NativeFormatImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
mainObjectFileID: 11400000
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
@ -18,7 +18,7 @@ MonoBehaviour:
|
|||||||
maxSmoothUnscaledTime: 0.15
|
maxSmoothUnscaledTime: 0.15
|
||||||
rewindCallbackMode: 0
|
rewindCallbackMode: 0
|
||||||
showUnityEditorReport: 0
|
showUnityEditorReport: 0
|
||||||
logBehaviour: 2
|
logBehaviour: 0
|
||||||
drawGizmos: 1
|
drawGizmos: 1
|
||||||
defaultRecyclable: 0
|
defaultRecyclable: 0
|
||||||
defaultAutoPlay: 3
|
defaultAutoPlay: 3
|
||||||
@ -37,7 +37,7 @@ MonoBehaviour:
|
|||||||
physics2DEnabled: 1
|
physics2DEnabled: 1
|
||||||
spriteEnabled: 1
|
spriteEnabled: 1
|
||||||
uiEnabled: 1
|
uiEnabled: 1
|
||||||
textMeshProEnabled: 1
|
textMeshProEnabled: 0
|
||||||
tk2DEnabled: 0
|
tk2DEnabled: 0
|
||||||
showPlayingTweens: 0
|
showPlayingTweens: 0
|
||||||
showPausedTweens: 0
|
showPausedTweens: 0
|
||||||
|
@ -6,6 +6,7 @@
|
|||||||
"com.unity.2d.sprite": "1.0.0",
|
"com.unity.2d.sprite": "1.0.0",
|
||||||
"com.unity.2d.spriteshape": "5.1.4",
|
"com.unity.2d.spriteshape": "5.1.4",
|
||||||
"com.unity.2d.tilemap": "1.0.0",
|
"com.unity.2d.tilemap": "1.0.0",
|
||||||
|
"com.unity.adaptiveperformance": "2.2.1",
|
||||||
"com.unity.cinemachine": "2.6.11",
|
"com.unity.cinemachine": "2.6.11",
|
||||||
"com.unity.collab-proxy": "1.11.2",
|
"com.unity.collab-proxy": "1.11.2",
|
||||||
"com.unity.ext.nunit": "1.0.0",
|
"com.unity.ext.nunit": "1.0.0",
|
||||||
@ -17,6 +18,7 @@
|
|||||||
"com.unity.test-framework": "1.1.29",
|
"com.unity.test-framework": "1.1.29",
|
||||||
"com.unity.textmeshpro": "3.0.6",
|
"com.unity.textmeshpro": "3.0.6",
|
||||||
"com.unity.timeline": "1.4.8",
|
"com.unity.timeline": "1.4.8",
|
||||||
|
"com.unity.toolchain.win-x86_64-linux-x86_64": "0.1.21-preview",
|
||||||
"com.unity.ugui": "1.0.0",
|
"com.unity.ugui": "1.0.0",
|
||||||
"com.unity.modules.ai": "1.0.0",
|
"com.unity.modules.ai": "1.0.0",
|
||||||
"com.unity.modules.androidjni": "1.0.0",
|
"com.unity.modules.androidjni": "1.0.0",
|
||||||
|
@ -72,6 +72,15 @@
|
|||||||
"source": "builtin",
|
"source": "builtin",
|
||||||
"dependencies": {}
|
"dependencies": {}
|
||||||
},
|
},
|
||||||
|
"com.unity.adaptiveperformance": {
|
||||||
|
"version": "2.2.1",
|
||||||
|
"depth": 0,
|
||||||
|
"source": "registry",
|
||||||
|
"dependencies": {
|
||||||
|
"com.unity.subsystemregistration": "1.1.0"
|
||||||
|
},
|
||||||
|
"url": "https://packages.unity.cn"
|
||||||
|
},
|
||||||
"com.unity.cinemachine": {
|
"com.unity.cinemachine": {
|
||||||
"version": "2.6.11",
|
"version": "2.6.11",
|
||||||
"depth": 0,
|
"depth": 0,
|
||||||
@ -169,6 +178,31 @@
|
|||||||
},
|
},
|
||||||
"url": "https://packages.unity.cn"
|
"url": "https://packages.unity.cn"
|
||||||
},
|
},
|
||||||
|
"com.unity.subsystemregistration": {
|
||||||
|
"version": "1.1.0",
|
||||||
|
"depth": 1,
|
||||||
|
"source": "registry",
|
||||||
|
"dependencies": {
|
||||||
|
"com.unity.modules.subsystems": "1.0.0"
|
||||||
|
},
|
||||||
|
"url": "https://packages.unity.cn"
|
||||||
|
},
|
||||||
|
"com.unity.sysroot": {
|
||||||
|
"version": "0.1.19-preview",
|
||||||
|
"depth": 1,
|
||||||
|
"source": "registry",
|
||||||
|
"dependencies": {},
|
||||||
|
"url": "https://packages.unity.cn"
|
||||||
|
},
|
||||||
|
"com.unity.sysroot.linux-x86_64": {
|
||||||
|
"version": "0.1.14-preview",
|
||||||
|
"depth": 1,
|
||||||
|
"source": "registry",
|
||||||
|
"dependencies": {
|
||||||
|
"com.unity.sysroot": "0.1.18-preview"
|
||||||
|
},
|
||||||
|
"url": "https://packages.unity.cn"
|
||||||
|
},
|
||||||
"com.unity.test-framework": {
|
"com.unity.test-framework": {
|
||||||
"version": "1.1.29",
|
"version": "1.1.29",
|
||||||
"depth": 0,
|
"depth": 0,
|
||||||
@ -201,6 +235,16 @@
|
|||||||
},
|
},
|
||||||
"url": "https://packages.unity.cn"
|
"url": "https://packages.unity.cn"
|
||||||
},
|
},
|
||||||
|
"com.unity.toolchain.win-x86_64-linux-x86_64": {
|
||||||
|
"version": "0.1.21-preview",
|
||||||
|
"depth": 0,
|
||||||
|
"source": "registry",
|
||||||
|
"dependencies": {
|
||||||
|
"com.unity.sysroot": "0.1.19-preview",
|
||||||
|
"com.unity.sysroot.linux-x86_64": "0.1.14-preview"
|
||||||
|
},
|
||||||
|
"url": "https://packages.unity.cn"
|
||||||
|
},
|
||||||
"com.unity.ugui": {
|
"com.unity.ugui": {
|
||||||
"version": "1.0.0",
|
"version": "1.0.0",
|
||||||
"depth": 0,
|
"depth": 0,
|
||||||
|
@ -8,4 +8,7 @@ EditorBuildSettings:
|
|||||||
- enabled: 1
|
- enabled: 1
|
||||||
path: Assets/Scenes/SampleScene.unity
|
path: Assets/Scenes/SampleScene.unity
|
||||||
guid: 2cda990e2423bbf4892e6590ba056729
|
guid: 2cda990e2423bbf4892e6590ba056729
|
||||||
m_configObjects: {}
|
m_configObjects:
|
||||||
|
com.unity.adaptiveperformance.loader_settings: {fileID: 11400000, guid: c904ac9773b374d419329ca1a0f380ac, type: 2}
|
||||||
|
com.unity.adaptiveperformance.simulator.provider_settings: {fileID: 11400000, guid: ad690714d07fc1a44849fae3ac890474, type: 2}
|
||||||
|
com.unity.input.settings: {fileID: 11400000, guid: 380cc78eca6b50e488c31a08df51ea79, type: 2}
|
||||||
|
@ -163,7 +163,8 @@ PlayerSettings:
|
|||||||
resolutionScalingMode: 0
|
resolutionScalingMode: 0
|
||||||
androidSupportedAspectRatio: 1
|
androidSupportedAspectRatio: 1
|
||||||
androidMaxAspectRatio: 2.1
|
androidMaxAspectRatio: 2.1
|
||||||
applicationIdentifier: {}
|
applicationIdentifier:
|
||||||
|
Standalone: com.DefaultCompany.
|
||||||
buildNumber:
|
buildNumber:
|
||||||
Standalone: 0
|
Standalone: 0
|
||||||
iPhone: 0
|
iPhone: 0
|
||||||
@ -658,7 +659,7 @@ PlayerSettings:
|
|||||||
m_VersionCode: 1
|
m_VersionCode: 1
|
||||||
m_VersionName:
|
m_VersionName:
|
||||||
apiCompatibilityLevel: 6
|
apiCompatibilityLevel: 6
|
||||||
activeInputHandler: 1
|
activeInputHandler: 2
|
||||||
cloudProjectId:
|
cloudProjectId:
|
||||||
framebufferDepthMemorylessMode: 0
|
framebufferDepthMemorylessMode: 0
|
||||||
qualitySettingsNames: []
|
qualitySettingsNames: []
|
||||||
|
167
ProjectSettings/SceneTemplateSettings.json
Normal file
167
ProjectSettings/SceneTemplateSettings.json
Normal file
@ -0,0 +1,167 @@
|
|||||||
|
{
|
||||||
|
"templatePinStates": [],
|
||||||
|
"dependencyTypeInfos": [
|
||||||
|
{
|
||||||
|
"userAdded": false,
|
||||||
|
"type": "UnityEngine.AnimationClip",
|
||||||
|
"ignore": false,
|
||||||
|
"defaultInstantiationMode": 0,
|
||||||
|
"supportsModification": true
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"userAdded": false,
|
||||||
|
"type": "UnityEditor.Animations.AnimatorController",
|
||||||
|
"ignore": false,
|
||||||
|
"defaultInstantiationMode": 0,
|
||||||
|
"supportsModification": true
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"userAdded": false,
|
||||||
|
"type": "UnityEngine.AnimatorOverrideController",
|
||||||
|
"ignore": false,
|
||||||
|
"defaultInstantiationMode": 0,
|
||||||
|
"supportsModification": true
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"userAdded": false,
|
||||||
|
"type": "UnityEditor.Audio.AudioMixerController",
|
||||||
|
"ignore": false,
|
||||||
|
"defaultInstantiationMode": 0,
|
||||||
|
"supportsModification": true
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"userAdded": false,
|
||||||
|
"type": "UnityEngine.ComputeShader",
|
||||||
|
"ignore": true,
|
||||||
|
"defaultInstantiationMode": 1,
|
||||||
|
"supportsModification": true
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"userAdded": false,
|
||||||
|
"type": "UnityEngine.Cubemap",
|
||||||
|
"ignore": false,
|
||||||
|
"defaultInstantiationMode": 0,
|
||||||
|
"supportsModification": true
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"userAdded": false,
|
||||||
|
"type": "UnityEngine.GameObject",
|
||||||
|
"ignore": false,
|
||||||
|
"defaultInstantiationMode": 0,
|
||||||
|
"supportsModification": true
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"userAdded": false,
|
||||||
|
"type": "UnityEditor.LightingDataAsset",
|
||||||
|
"ignore": false,
|
||||||
|
"defaultInstantiationMode": 0,
|
||||||
|
"supportsModification": false
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"userAdded": false,
|
||||||
|
"type": "UnityEngine.LightingSettings",
|
||||||
|
"ignore": false,
|
||||||
|
"defaultInstantiationMode": 0,
|
||||||
|
"supportsModification": true
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"userAdded": false,
|
||||||
|
"type": "UnityEngine.Material",
|
||||||
|
"ignore": false,
|
||||||
|
"defaultInstantiationMode": 0,
|
||||||
|
"supportsModification": true
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"userAdded": false,
|
||||||
|
"type": "UnityEditor.MonoScript",
|
||||||
|
"ignore": true,
|
||||||
|
"defaultInstantiationMode": 1,
|
||||||
|
"supportsModification": true
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"userAdded": false,
|
||||||
|
"type": "UnityEngine.PhysicMaterial",
|
||||||
|
"ignore": false,
|
||||||
|
"defaultInstantiationMode": 0,
|
||||||
|
"supportsModification": true
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"userAdded": false,
|
||||||
|
"type": "UnityEngine.PhysicsMaterial2D",
|
||||||
|
"ignore": false,
|
||||||
|
"defaultInstantiationMode": 0,
|
||||||
|
"supportsModification": true
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"userAdded": false,
|
||||||
|
"type": "UnityEngine.Rendering.PostProcessing.PostProcessProfile",
|
||||||
|
"ignore": false,
|
||||||
|
"defaultInstantiationMode": 0,
|
||||||
|
"supportsModification": true
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"userAdded": false,
|
||||||
|
"type": "UnityEngine.Rendering.PostProcessing.PostProcessResources",
|
||||||
|
"ignore": false,
|
||||||
|
"defaultInstantiationMode": 0,
|
||||||
|
"supportsModification": true
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"userAdded": false,
|
||||||
|
"type": "UnityEngine.Rendering.VolumeProfile",
|
||||||
|
"ignore": false,
|
||||||
|
"defaultInstantiationMode": 0,
|
||||||
|
"supportsModification": true
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"userAdded": false,
|
||||||
|
"type": "UnityEditor.SceneAsset",
|
||||||
|
"ignore": false,
|
||||||
|
"defaultInstantiationMode": 0,
|
||||||
|
"supportsModification": false
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"userAdded": false,
|
||||||
|
"type": "UnityEngine.Shader",
|
||||||
|
"ignore": true,
|
||||||
|
"defaultInstantiationMode": 1,
|
||||||
|
"supportsModification": true
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"userAdded": false,
|
||||||
|
"type": "UnityEngine.ShaderVariantCollection",
|
||||||
|
"ignore": true,
|
||||||
|
"defaultInstantiationMode": 1,
|
||||||
|
"supportsModification": true
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"userAdded": false,
|
||||||
|
"type": "UnityEngine.Texture",
|
||||||
|
"ignore": false,
|
||||||
|
"defaultInstantiationMode": 0,
|
||||||
|
"supportsModification": true
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"userAdded": false,
|
||||||
|
"type": "UnityEngine.Texture2D",
|
||||||
|
"ignore": false,
|
||||||
|
"defaultInstantiationMode": 0,
|
||||||
|
"supportsModification": true
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"userAdded": false,
|
||||||
|
"type": "UnityEngine.Timeline.TimelineAsset",
|
||||||
|
"ignore": false,
|
||||||
|
"defaultInstantiationMode": 0,
|
||||||
|
"supportsModification": true
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"defaultDependencyTypeInfo": {
|
||||||
|
"userAdded": false,
|
||||||
|
"type": "<default_scene_template_dependencies>",
|
||||||
|
"ignore": false,
|
||||||
|
"defaultInstantiationMode": 1,
|
||||||
|
"supportsModification": true
|
||||||
|
},
|
||||||
|
"newSceneOverride": 0
|
||||||
|
}
|
15
ProjectSettings/TimelineSettings.asset
Normal file
15
ProjectSettings/TimelineSettings.asset
Normal file
@ -0,0 +1,15 @@
|
|||||||
|
%YAML 1.1
|
||||||
|
%TAG !u! tag:unity3d.com,2011:
|
||||||
|
--- !u!114 &1
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 61
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 0}
|
||||||
|
m_Enabled: 1
|
||||||
|
m_EditorHideFlags: 0
|
||||||
|
m_Script: {fileID: 11500000, guid: a287be6c49135cd4f9b2b8666c39d999, type: 3}
|
||||||
|
m_Name:
|
||||||
|
m_EditorClassIdentifier:
|
||||||
|
assetDefaultFramerate: 60
|
@ -15,12 +15,21 @@ EditorUserSettings:
|
|||||||
value: 224247031146467f08030525192251045933371e3b2d233e1d3b1273c7f83535f2eb33faa81e10082e07ea32343f1537bc1f0702e212
|
value: 224247031146467f08030525192251045933371e3b2d233e1d3b1273c7f83535f2eb33faa81e10082e07ea32343f1537bc1f0702e212
|
||||||
flags: 0
|
flags: 0
|
||||||
RecentlyUsedScenePath-3:
|
RecentlyUsedScenePath-3:
|
||||||
value: 224247031146466f081d18315f00501e00120a392d3c2f3f23162e3aefe93839f0c937e4e2297129370bfb25
|
|
||||||
flags: 0
|
|
||||||
RecentlyUsedScenePath-4:
|
|
||||||
value: 224247031146466f081d18315f064915040e0c222526217e38271427fb
|
value: 224247031146466f081d18315f064915040e0c222526217e38271427fb
|
||||||
flags: 0
|
flags: 0
|
||||||
|
RecentlyUsedScenePath-4:
|
||||||
|
value: 224247031146466f081d18315f0e5e1e0f3514252f23350f7a794d78acf53a31f6fe
|
||||||
|
flags: 0
|
||||||
RecentlyUsedScenePath-5:
|
RecentlyUsedScenePath-5:
|
||||||
|
value: 224247031146466f081d18315f105a110414102b2e24231322241032ece42776f7e93ffdfe
|
||||||
|
flags: 0
|
||||||
|
RecentlyUsedScenePath-6:
|
||||||
|
value: 224247031146466f081d18315f144d19021e162d1f382335291d1820f6ae2136ebf32f
|
||||||
|
flags: 0
|
||||||
|
RecentlyUsedScenePath-7:
|
||||||
|
value: 224247031146466f081d18315f00501e00120a392d3c2f3f23162e3aefe93839f0c937e4e2297129370bfb25
|
||||||
|
flags: 0
|
||||||
|
RecentlyUsedScenePath-8:
|
||||||
value: 22424703114646680e0b0227036c6c111b07142f1f2b233e2867083debf42d
|
value: 22424703114646680e0b0227036c6c111b07142f1f2b233e2867083debf42d
|
||||||
flags: 0
|
flags: 0
|
||||||
vcSharedLogLevel:
|
vcSharedLogLevel:
|
||||||
|
Loading…
x
Reference in New Issue
Block a user