fix playerprefs usage + rename audiobundles

This commit is contained in:
mangorifo
2024-02-04 17:52:19 +08:00
parent b3bb082a6b
commit 4804b2e0e5
12 changed files with 616 additions and 192 deletions
+11 -11
View File
@@ -31,7 +31,7 @@ AnimationClip:
inWeight: 0.33333334 inWeight: 0.33333334
outWeight: 0.33333334 outWeight: 0.33333334
- serializedVersion: 3 - serializedVersion: 3
time: 2 time: 1.1833333
value: -3000 value: -3000
inSlope: 0 inSlope: 0
outSlope: 0 outSlope: 0
@@ -61,7 +61,7 @@ AnimationClip:
inWeight: 0 inWeight: 0
outWeight: 0 outWeight: 0
- serializedVersion: 3 - serializedVersion: 3
time: 2 time: 1.1833333
value: 0 value: 0
inSlope: Infinity inSlope: Infinity
outSlope: Infinity outSlope: Infinity
@@ -91,7 +91,7 @@ AnimationClip:
inWeight: 0 inWeight: 0
outWeight: 0 outWeight: 0
- serializedVersion: 3 - serializedVersion: 3
time: 2 time: 1.1833333
value: 0 value: 0
inSlope: Infinity inSlope: Infinity
outSlope: Infinity outSlope: Infinity
@@ -121,7 +121,7 @@ AnimationClip:
inWeight: 0 inWeight: 0
outWeight: 0 outWeight: 0
- serializedVersion: 3 - serializedVersion: 3
time: 2 time: 1.1833333
value: 0 value: 0
inSlope: Infinity inSlope: Infinity
outSlope: Infinity outSlope: Infinity
@@ -151,7 +151,7 @@ AnimationClip:
inWeight: 0 inWeight: 0
outWeight: 0 outWeight: 0
- serializedVersion: 3 - serializedVersion: 3
time: 1.1666666 time: 0.51666665
value: 1 value: 1
inSlope: Infinity inSlope: Infinity
outSlope: Infinity outSlope: Infinity
@@ -181,7 +181,7 @@ AnimationClip:
m_AdditiveReferencePoseClip: {fileID: 0} m_AdditiveReferencePoseClip: {fileID: 0}
m_AdditiveReferencePoseTime: 0 m_AdditiveReferencePoseTime: 0
m_StartTime: 0 m_StartTime: 0
m_StopTime: 2 m_StopTime: 1.1833333
m_OrientationOffsetY: 0 m_OrientationOffsetY: 0
m_Level: 0 m_Level: 0
m_CycleOffset: 0 m_CycleOffset: 0
@@ -211,7 +211,7 @@ AnimationClip:
inWeight: 0.33333334 inWeight: 0.33333334
outWeight: 0.33333334 outWeight: 0.33333334
- serializedVersion: 3 - serializedVersion: 3
time: 2 time: 1.1833333
value: -3000 value: -3000
inSlope: 0 inSlope: 0
outSlope: 0 outSlope: 0
@@ -241,7 +241,7 @@ AnimationClip:
inWeight: 0 inWeight: 0
outWeight: 0 outWeight: 0
- serializedVersion: 3 - serializedVersion: 3
time: 2 time: 1.1833333
value: 0 value: 0
inSlope: Infinity inSlope: Infinity
outSlope: Infinity outSlope: Infinity
@@ -271,7 +271,7 @@ AnimationClip:
inWeight: 0 inWeight: 0
outWeight: 0 outWeight: 0
- serializedVersion: 3 - serializedVersion: 3
time: 2 time: 1.1833333
value: 0 value: 0
inSlope: Infinity inSlope: Infinity
outSlope: Infinity outSlope: Infinity
@@ -301,7 +301,7 @@ AnimationClip:
inWeight: 0 inWeight: 0
outWeight: 0 outWeight: 0
- serializedVersion: 3 - serializedVersion: 3
time: 2 time: 1.1833333
value: 0 value: 0
inSlope: Infinity inSlope: Infinity
outSlope: Infinity outSlope: Infinity
@@ -331,7 +331,7 @@ AnimationClip:
inWeight: 0 inWeight: 0
outWeight: 0 outWeight: 0
- serializedVersion: 3 - serializedVersion: 3
time: 1.1666666 time: 0.51666665
value: 1 value: 1
inSlope: Infinity inSlope: Infinity
outSlope: Infinity outSlope: Infinity
+1 -11
View File
@@ -4947,11 +4947,6 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 9ebb03e8ca618694080ece78e1ba1877, type: 3} m_Script: {fileID: 11500000, guid: 9ebb03e8ca618694080ece78e1ba1877, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
scrolling: 0
objectRot: {fileID: 0}
sn: {fileID: 0}
movespeed: 5
srate: 2
GameObjectList: GameObjectList:
DestroyParentIfNotDevelopment: 0 DestroyParentIfNotDevelopment: 0
Parent: {fileID: 0} Parent: {fileID: 0}
@@ -5084,7 +5079,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 1364c6a5f152d214e9fb335f8a4fb2b2, type: 3} m_Script: {fileID: 11500000, guid: 1364c6a5f152d214e9fb335f8a4fb2b2, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
AudioAssetBundleName: Audio.blk AudioAssetBundleName: BuiltinAudio.blk
AudioAssetBundle: {fileID: 0} AudioAssetBundle: {fileID: 0}
--- !u!1 &1361148077 --- !u!1 &1361148077
GameObject: GameObject:
@@ -7641,11 +7636,6 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 9ebb03e8ca618694080ece78e1ba1877, type: 3} m_Script: {fileID: 11500000, guid: 9ebb03e8ca618694080ece78e1ba1877, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
scrolling: 0
objectRot: {fileID: 0}
sn: {fileID: 0}
movespeed: 3
srate: 2
GameObjectList: GameObjectList:
DestroyParentIfNotDevelopment: 0 DestroyParentIfNotDevelopment: 0
Parent: {fileID: 0} Parent: {fileID: 0}
+44 -86
View File
@@ -537,11 +537,6 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 9ebb03e8ca618694080ece78e1ba1877, type: 3} m_Script: {fileID: 11500000, guid: 9ebb03e8ca618694080ece78e1ba1877, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
scrolling: 0
objectRot: {fileID: 0}
sn: {fileID: 0}
movespeed: 3
srate: 2
GameObjectList: GameObjectList:
DestroyParentIfNotDevelopment: 0 DestroyParentIfNotDevelopment: 0
Parent: {fileID: 0} Parent: {fileID: 0}
@@ -934,6 +929,7 @@ MonoBehaviour:
settingsPanelDeactivator: {fileID: 179756162} settingsPanelDeactivator: {fileID: 179756162}
DisableSettingsPanelWhenLinkedGameobjectIsActivated: 1 DisableSettingsPanelWhenLinkedGameobjectIsActivated: 1
GraphicsQualityDropdown: {fileID: 0} GraphicsQualityDropdown: {fileID: 0}
FullscreenToggle: {fileID: 0}
PostProcessVolume: {fileID: 0} PostProcessVolume: {fileID: 0}
PostProcessingVolumes: [] PostProcessingVolumes: []
--- !u!1 &180890013 --- !u!1 &180890013
@@ -988,6 +984,7 @@ MonoBehaviour:
settingsPanelDeactivator: {fileID: 180890013} settingsPanelDeactivator: {fileID: 180890013}
DisableSettingsPanelWhenLinkedGameobjectIsActivated: 1 DisableSettingsPanelWhenLinkedGameobjectIsActivated: 1
GraphicsQualityDropdown: {fileID: 0} GraphicsQualityDropdown: {fileID: 0}
FullscreenToggle: {fileID: 0}
PostProcessVolume: {fileID: 0} PostProcessVolume: {fileID: 0}
PostProcessingVolumes: [] PostProcessingVolumes: []
--- !u!1 &181971069 --- !u!1 &181971069
@@ -1039,11 +1036,6 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 9ebb03e8ca618694080ece78e1ba1877, type: 3} m_Script: {fileID: 11500000, guid: 9ebb03e8ca618694080ece78e1ba1877, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
scrolling: 0
objectRot: {fileID: 0}
sn: {fileID: 0}
movespeed: 3
srate: 2
GameObjectList: GameObjectList:
DestroyParentIfNotDevelopment: 0 DestroyParentIfNotDevelopment: 0
Parent: {fileID: 0} Parent: {fileID: 0}
@@ -5977,11 +5969,6 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 9ebb03e8ca618694080ece78e1ba1877, type: 3} m_Script: {fileID: 11500000, guid: 9ebb03e8ca618694080ece78e1ba1877, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
scrolling: 0
objectRot: {fileID: 0}
sn: {fileID: 0}
movespeed: 3
srate: 2
GameObjectList: GameObjectList:
DestroyParentIfNotDevelopment: 0 DestroyParentIfNotDevelopment: 0
Parent: {fileID: 0} Parent: {fileID: 0}
@@ -6434,7 +6421,7 @@ MonoBehaviour:
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 440585719} m_GameObject: {fileID: 440585719}
m_Enabled: 1 m_Enabled: 0
m_EditorHideFlags: 0 m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 8b9a305e18de0c04dbd257a21cd47087, type: 3} m_Script: {fileID: 11500000, guid: 8b9a305e18de0c04dbd257a21cd47087, type: 3}
m_Name: m_Name:
@@ -11679,11 +11666,6 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 9ebb03e8ca618694080ece78e1ba1877, type: 3} m_Script: {fileID: 11500000, guid: 9ebb03e8ca618694080ece78e1ba1877, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
scrolling: 0
objectRot: {fileID: 0}
sn: {fileID: 0}
movespeed: 3
srate: 2
GameObjectList: GameObjectList:
DestroyParentIfNotDevelopment: 0 DestroyParentIfNotDevelopment: 0
Parent: {fileID: 0} Parent: {fileID: 0}
@@ -11907,11 +11889,6 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 9ebb03e8ca618694080ece78e1ba1877, type: 3} m_Script: {fileID: 11500000, guid: 9ebb03e8ca618694080ece78e1ba1877, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
scrolling: 0
objectRot: {fileID: 0}
sn: {fileID: 0}
movespeed: 3
srate: 2
GameObjectList: GameObjectList:
DestroyParentIfNotDevelopment: 0 DestroyParentIfNotDevelopment: 0
Parent: {fileID: 0} Parent: {fileID: 0}
@@ -13018,11 +12995,6 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 9ebb03e8ca618694080ece78e1ba1877, type: 3} m_Script: {fileID: 11500000, guid: 9ebb03e8ca618694080ece78e1ba1877, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
scrolling: 0
objectRot: {fileID: 0}
sn: {fileID: 0}
movespeed: 3
srate: 2
GameObjectList: GameObjectList:
DestroyParentIfNotDevelopment: 0 DestroyParentIfNotDevelopment: 0
Parent: {fileID: 0} Parent: {fileID: 0}
@@ -13493,7 +13465,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -712, y: -1152} m_AnchoredPosition: {x: -3000, y: -1152}
m_SizeDelta: {x: 1533, y: 720} m_SizeDelta: {x: 1533, y: 720}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &993111643 --- !u!114 &993111643
@@ -13567,6 +13539,7 @@ MonoBehaviour:
settingsPanelDeactivator: {fileID: 0} settingsPanelDeactivator: {fileID: 0}
DisableSettingsPanelWhenLinkedGameobjectIsActivated: 0 DisableSettingsPanelWhenLinkedGameobjectIsActivated: 0
GraphicsQualityDropdown: {fileID: 1174489119} GraphicsQualityDropdown: {fileID: 1174489119}
FullscreenToggle: {fileID: 0}
PostProcessVolume: {fileID: 0} PostProcessVolume: {fileID: 0}
PostProcessingVolumes: PostProcessingVolumes:
- {fileID: 1223462657} - {fileID: 1223462657}
@@ -14656,7 +14629,7 @@ MonoBehaviour:
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1223462654} m_GameObject: {fileID: 1223462654}
m_Enabled: 1 m_Enabled: 0
m_EditorHideFlags: 0 m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 8b9a305e18de0c04dbd257a21cd47087, type: 3} m_Script: {fileID: 11500000, guid: 8b9a305e18de0c04dbd257a21cd47087, type: 3}
m_Name: m_Name:
@@ -14774,11 +14747,6 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 9ebb03e8ca618694080ece78e1ba1877, type: 3} m_Script: {fileID: 11500000, guid: 9ebb03e8ca618694080ece78e1ba1877, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
scrolling: 0
objectRot: {fileID: 0}
sn: {fileID: 0}
movespeed: 3
srate: 2
GameObjectList: GameObjectList:
DestroyParentIfNotDevelopment: 0 DestroyParentIfNotDevelopment: 0
Parent: {fileID: 0} Parent: {fileID: 0}
@@ -14844,11 +14812,6 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 9ebb03e8ca618694080ece78e1ba1877, type: 3} m_Script: {fileID: 11500000, guid: 9ebb03e8ca618694080ece78e1ba1877, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
scrolling: 0
objectRot: {fileID: 0}
sn: {fileID: 0}
movespeed: 3
srate: 2
GameObjectList: GameObjectList:
DestroyParentIfNotDevelopment: 0 DestroyParentIfNotDevelopment: 0
Parent: {fileID: 0} Parent: {fileID: 0}
@@ -15044,11 +15007,6 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 9ebb03e8ca618694080ece78e1ba1877, type: 3} m_Script: {fileID: 11500000, guid: 9ebb03e8ca618694080ece78e1ba1877, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
scrolling: 0
objectRot: {fileID: 0}
sn: {fileID: 0}
movespeed: 3
srate: 2
GameObjectList: GameObjectList:
DestroyParentIfNotDevelopment: 0 DestroyParentIfNotDevelopment: 0
Parent: {fileID: 0} Parent: {fileID: 0}
@@ -15428,6 +15386,42 @@ MonoBehaviour:
m_StringArgument: m_StringArgument:
m_BoolArgument: 0 m_BoolArgument: 0
m_CallState: 2 m_CallState: 2
- m_Target: {fileID: 2050239836}
m_TargetAssemblyTypeName: JTN.Utils, Assembly-CSharp
m_MethodName: DisableTextMeshProButton
m_Mode: 2
m_Arguments:
m_ObjectArgument: {fileID: 1439570670}
m_ObjectArgumentAssemblyTypeName: UnityEngine.UI.Button, UnityEngine.UI
m_IntArgument: 0
m_FloatArgument: 0
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
- m_Target: {fileID: 2050239836}
m_TargetAssemblyTypeName: JTN.Utils, Assembly-CSharp
m_MethodName: DisableTextMeshProButton
m_Mode: 2
m_Arguments:
m_ObjectArgument: {fileID: 2106605399}
m_ObjectArgumentAssemblyTypeName: UnityEngine.UI.Button, UnityEngine.UI
m_IntArgument: 0
m_FloatArgument: 0
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
- m_Target: {fileID: 2050239836}
m_TargetAssemblyTypeName: JTN.Utils, Assembly-CSharp
m_MethodName: DisableTextMeshProButton
m_Mode: 2
m_Arguments:
m_ObjectArgument: {fileID: 67870790}
m_ObjectArgumentAssemblyTypeName: UnityEngine.UI.Button, UnityEngine.UI
m_IntArgument: 0
m_FloatArgument: 0
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
--- !u!114 &1439570671 --- !u!114 &1439570671
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@@ -15478,11 +15472,6 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 9ebb03e8ca618694080ece78e1ba1877, type: 3} m_Script: {fileID: 11500000, guid: 9ebb03e8ca618694080ece78e1ba1877, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
scrolling: 0
objectRot: {fileID: 0}
sn: {fileID: 0}
movespeed: 3
srate: 2
GameObjectList: GameObjectList:
DestroyParentIfNotDevelopment: 0 DestroyParentIfNotDevelopment: 0
Parent: {fileID: 0} Parent: {fileID: 0}
@@ -26232,11 +26221,6 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 9ebb03e8ca618694080ece78e1ba1877, type: 3} m_Script: {fileID: 11500000, guid: 9ebb03e8ca618694080ece78e1ba1877, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
scrolling: 0
objectRot: {fileID: 0}
sn: {fileID: 0}
movespeed: 3
srate: 2
GameObjectList: GameObjectList:
DestroyParentIfNotDevelopment: 0 DestroyParentIfNotDevelopment: 0
Parent: {fileID: 0} Parent: {fileID: 0}
@@ -26558,11 +26542,6 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 9ebb03e8ca618694080ece78e1ba1877, type: 3} m_Script: {fileID: 11500000, guid: 9ebb03e8ca618694080ece78e1ba1877, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
scrolling: 0
objectRot: {fileID: 0}
sn: {fileID: 0}
movespeed: 3
srate: 2
GameObjectList: GameObjectList:
DestroyParentIfNotDevelopment: 0 DestroyParentIfNotDevelopment: 0
Parent: {fileID: 0} Parent: {fileID: 0}
@@ -26704,11 +26683,6 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 9ebb03e8ca618694080ece78e1ba1877, type: 3} m_Script: {fileID: 11500000, guid: 9ebb03e8ca618694080ece78e1ba1877, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
scrolling: 0
objectRot: {fileID: 0}
sn: {fileID: 0}
movespeed: 3
srate: 2
GameObjectList: GameObjectList:
DestroyParentIfNotDevelopment: 0 DestroyParentIfNotDevelopment: 0
Parent: {fileID: 0} Parent: {fileID: 0}
@@ -27102,7 +27076,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -712, y: -1152} m_AnchoredPosition: {x: -3000, y: -1152}
m_SizeDelta: {x: 1533, y: 720} m_SizeDelta: {x: 1533, y: 720}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!111 &1966498684 --- !u!111 &1966498684
@@ -27673,11 +27647,6 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 9ebb03e8ca618694080ece78e1ba1877, type: 3} m_Script: {fileID: 11500000, guid: 9ebb03e8ca618694080ece78e1ba1877, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
scrolling: 0
objectRot: {fileID: 0}
sn: {fileID: 0}
movespeed: 3
srate: 2
GameObjectList: GameObjectList:
DestroyParentIfNotDevelopment: 0 DestroyParentIfNotDevelopment: 0
Parent: {fileID: 0} Parent: {fileID: 0}
@@ -27721,7 +27690,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 1364c6a5f152d214e9fb335f8a4fb2b2, type: 3} m_Script: {fileID: 11500000, guid: 1364c6a5f152d214e9fb335f8a4fb2b2, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
AudioAssetBundleName: Audio.blk AudioAssetBundleName: BuiltinAudio.blk
AudioAssetBundle: {fileID: 0} AudioAssetBundle: {fileID: 0}
--- !u!114 &2050239839 --- !u!114 &2050239839
MonoBehaviour: MonoBehaviour:
@@ -27749,7 +27718,6 @@ MonoBehaviour:
BundleLoader: {fileID: 2050239838} BundleLoader: {fileID: 2050239838}
AudioBundle: {fileID: 0} AudioBundle: {fileID: 0}
SettingsPanel: {fileID: 993111642} SettingsPanel: {fileID: 993111642}
FullscreenToggle: {fileID: 1410129874}
PostProcessingToggle: {fileID: 1442607804} PostProcessingToggle: {fileID: 1442607804}
SettingsPanelScript: {fileID: 993111646} SettingsPanelScript: {fileID: 993111646}
--- !u!1 &2055913294 --- !u!1 &2055913294
@@ -28085,11 +28053,6 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 9ebb03e8ca618694080ece78e1ba1877, type: 3} m_Script: {fileID: 11500000, guid: 9ebb03e8ca618694080ece78e1ba1877, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
scrolling: 0
objectRot: {fileID: 0}
sn: {fileID: 0}
movespeed: 3
srate: 2
GameObjectList: GameObjectList:
DestroyParentIfNotDevelopment: 0 DestroyParentIfNotDevelopment: 0
Parent: {fileID: 0} Parent: {fileID: 0}
@@ -28191,11 +28154,6 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 9ebb03e8ca618694080ece78e1ba1877, type: 3} m_Script: {fileID: 11500000, guid: 9ebb03e8ca618694080ece78e1ba1877, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
scrolling: 0
objectRot: {fileID: 0}
sn: {fileID: 0}
movespeed: 3
srate: 2
GameObjectList: GameObjectList:
DestroyParentIfNotDevelopment: 0 DestroyParentIfNotDevelopment: 0
Parent: {fileID: 0} Parent: {fileID: 0}
@@ -44,28 +44,6 @@ MonoBehaviour:
opacity: opacity:
overrideState: 0 overrideState: 0
value: 1 value: 1
--- !u!114 &-7234206141172707132
MonoBehaviour:
m_ObjectHideFlags: 3
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: b94fcd11afffcb142908bfcb1e261fba, type: 3}
m_Name: MotionBlur
m_EditorClassIdentifier:
active: 0
enabled:
overrideState: 1
value: 0
shutterAngle:
overrideState: 0
value: 270
sampleCount:
overrideState: 0
value: 10
--- !u!114 &-6821381098240187774 --- !u!114 &-6821381098240187774
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 3 m_ObjectHideFlags: 3
@@ -113,6 +91,5 @@ MonoBehaviour:
m_Name: UICamera Retro m_Name: UICamera Retro
m_EditorClassIdentifier: m_EditorClassIdentifier:
settings: settings:
- {fileID: -7234206141172707132}
- {fileID: -7712183634860835231} - {fileID: -7712183634860835231}
- {fileID: -6821381098240187774} - {fileID: -6821381098240187774}
+16 -1
View File
@@ -461,6 +461,17 @@ Transform:
m_Children: [] m_Children: []
m_Father: {fileID: 0} m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0} m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0}
--- !u!114 &371864280 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 1446691137847240566, guid: 9ab768a4c10b1c442a3d4acf2bf65f25, type: 3}
m_PrefabInstance: {fileID: 1629965480}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 9ebb03e8ca618694080ece78e1ba1877, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1001 &796667895 --- !u!1001 &796667895
PrefabInstance: PrefabInstance:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@@ -954,6 +965,10 @@ PrefabInstance:
propertyPath: MessageText propertyPath: MessageText
value: value:
objectReference: {fileID: 59725443} objectReference: {fileID: 59725443}
- target: {fileID: 4754335795268963860, guid: 9ab768a4c10b1c442a3d4acf2bf65f25, type: 3}
propertyPath: UtilsScript
value:
objectReference: {fileID: 371864280}
- target: {fileID: 4754335795268963860, guid: 9ab768a4c10b1c442a3d4acf2bf65f25, type: 3} - target: {fileID: 4754335795268963860, guid: 9ab768a4c10b1c442a3d4acf2bf65f25, type: 3}
propertyPath: useStartupScriptHere propertyPath: useStartupScriptHere
value: 1 value: 1
@@ -964,7 +979,7 @@ PrefabInstance:
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 4754335795268963860, guid: 9ab768a4c10b1c442a3d4acf2bf65f25, type: 3} - target: {fileID: 4754335795268963860, guid: 9ab768a4c10b1c442a3d4acf2bf65f25, type: 3}
propertyPath: FilesThatMustExistInStreamingAssetsToSwitchScenes.Array.data[0] propertyPath: FilesThatMustExistInStreamingAssetsToSwitchScenes.Array.data[0]
value: Audio\Audio.blk value: Audio\BuiltinAudio.blk
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 9061482355504199432, guid: 9ab768a4c10b1c442a3d4acf2bf65f25, type: 3} - target: {fileID: 9061482355504199432, guid: 9ab768a4c10b1c442a3d4acf2bf65f25, type: 3}
propertyPath: m_Name propertyPath: m_Name
@@ -27,7 +27,6 @@ public class HomeWorld_Initialize : MonoBehaviour
public AssetBundle AudioBundle; public AssetBundle AudioBundle;
public RectTransform SettingsPanel; public RectTransform SettingsPanel;
private Resolution GameResolutionPre; private Resolution GameResolutionPre;
public Toggle FullscreenToggle;
public Toggle PostProcessingToggle; public Toggle PostProcessingToggle;
public SettingsPanel SettingsPanelScript; public SettingsPanel SettingsPanelScript;
@@ -59,16 +58,6 @@ public class HomeWorld_Initialize : MonoBehaviour
} }
}*/ }*/
if (PlayerPrefs.HasKey("FullscreenState") && FullscreenToggle)
{
if (PlayerPrefs.GetInt("FullscreenState") == 1)
{
FullscreenToggle.isOn = true;
} else
{
FullscreenToggle.isOn = false;
}
}
if (PlayerPrefs.GetInt("PostProcessingEnabled") == 1) if (PlayerPrefs.GetInt("PostProcessingEnabled") == 1)
{ {
@@ -2,6 +2,7 @@ using TMPro;
using UnityEngine; using UnityEngine;
using System.Collections.Generic; using System.Collections.Generic;
using UnityEngine.Rendering.PostProcessing; using UnityEngine.Rendering.PostProcessing;
using UnityEngine.UI;
public class SettingsPanel : MonoBehaviour public class SettingsPanel : MonoBehaviour
{ {
@@ -9,6 +10,7 @@ public class SettingsPanel : MonoBehaviour
public GameObject settingsPanelDeactivator; public GameObject settingsPanelDeactivator;
public bool DisableSettingsPanelWhenLinkedGameobjectIsActivated = false; public bool DisableSettingsPanelWhenLinkedGameobjectIsActivated = false;
public TMP_Dropdown GraphicsQualityDropdown; public TMP_Dropdown GraphicsQualityDropdown;
public Toggle FullscreenToggle;
public PostProcessVolume PostProcessVolume; public PostProcessVolume PostProcessVolume;
public List<PostProcessVolume> PostProcessingVolumes = new() { }; public List<PostProcessVolume> PostProcessingVolumes = new() { };
@@ -44,7 +46,19 @@ public class SettingsPanel : MonoBehaviour
} }
GraphicsQualityDropdown.AddOptions(Options); GraphicsQualityDropdown.AddOptions(Options);
if (!PlayerPrefs.HasKey("QualityLevel"))
GraphicsQualityDropdown.value = QualitySettings.GetQualityLevel(); GraphicsQualityDropdown.value = QualitySettings.GetQualityLevel();
else
{
QualitySettings.SetQualityLevel(PlayerPrefs.GetInt("QualityLevel"));
GraphicsQualityDropdown.value = PlayerPrefs.GetInt("QualityLevel");
}
if (PlayerPrefs.HasKey("FullscreenState") && FullscreenToggle)
{
FullscreenToggle.isOn = bool.Parse(PlayerPrefs.GetString("FullscreenState"));
}
} }
} }
@@ -52,6 +66,7 @@ public class SettingsPanel : MonoBehaviour
{ {
if (GraphicsQualityDropdown) if (GraphicsQualityDropdown)
{ {
PlayerPrefs.SetInt("QualityLevel", index);
QualitySettings.SetQualityLevel(index); QualitySettings.SetQualityLevel(index);
} }
} }
+3 -11
View File
@@ -1,7 +1,6 @@
using System.IO; using System.IO;
using TMPro; using TMPro;
using UnityEngine; using UnityEngine;
using UnityEngine.UI;
using System.Collections.Generic; using System.Collections.Generic;
@@ -11,6 +10,7 @@ namespace JTN
{ {
public bool changeResolutionAutomatically; public bool changeResolutionAutomatically;
public bool useStartupScriptHere; public bool useStartupScriptHere;
public Utils UtilsScript;
public TMP_Text MessageText; public TMP_Text MessageText;
[ShowOnly] public int MissingAssetFiles = 0; [ShowOnly] public int MissingAssetFiles = 0;
public List<string> FilesThatMustExistInStreamingAssetsToSwitchScenes = new List<string>() { public List<string> FilesThatMustExistInStreamingAssetsToSwitchScenes = new List<string>() {
@@ -31,16 +31,8 @@ namespace JTN
else else
{ {
int FullscreenState = PlayerPrefs.GetInt("FullscreenState"); int FullscreenState = PlayerPrefs.GetInt("FullscreenState");
if (FullscreenState == 0) if (PlayerPrefs.HasKey("FullscreenState"))
{ UtilsScript.SetFullscreen(bool.Parse(PlayerPrefs.GetString("FullscreenState")));
Screen.fullScreenMode = FullScreenMode.Windowed;
Screen.SetResolution(1533, 720, false);
Debug.Log("Changed game resolution to 1533x720");
} else
{
Debug.Log($"Set game resolution to {Screen.currentResolution} (fullscreen)");
Screen.fullScreenMode = FullScreenMode.FullScreenWindow;
}
} }
} }
private void Start() private void Start()
+13 -25
View File
@@ -11,6 +11,7 @@ namespace JTN
{ {
public class Utils : MonoBehaviour public class Utils : MonoBehaviour
{ {
/*
public bool scrolling; public bool scrolling;
public GameObject objectRot; public GameObject objectRot;
public GameObject sn; public GameObject sn;
@@ -19,6 +20,7 @@ namespace JTN
private float tm = 0; private float tm = 0;
private bool once = false; private bool once = false;
private GameObject currentObjectRot; private GameObject currentObjectRot;
*/
public string GameObjectList; public string GameObjectList;
public bool DestroyParentIfNotDevelopment = false; public bool DestroyParentIfNotDevelopment = false;
@@ -107,34 +109,22 @@ namespace JTN
} }
private void Start() private void Start()
{ {
if (scrolling)
{
currentObjectRot = Instantiate(objectRot, sn.transform.position, sn.transform.rotation);
}
GameObject[] allObjects = UnityEngine.Object.FindObjectsOfType<GameObject>(); GameObject[] allObjects = UnityEngine.Object.FindObjectsOfType<GameObject>();
foreach (GameObject go in allObjects) foreach (GameObject go in allObjects)
GameObjectList = GameObjectList + ", " + go.name; GameObjectList = GameObjectList + ", " + go.name;
if (!Debug.isDebugBuild || Application.platform != RuntimePlatform.WindowsEditor) if (!Debug.isDebugBuild || Application.platform != RuntimePlatform.WindowsEditor)
Destroy(Parent); Destroy(Parent);
if (PlayerPrefs.HasKey("QualityLevel"))
QualitySettings.SetQualityLevel(PlayerPrefs.GetInt("QualityLevel"));
if (PlayerPrefs.HasKey("FullscreenState"))
SetFullscreen(bool.Parse(PlayerPrefs.GetString("FullscreenState")));
} }
private void FixedUpdate() private void FixedUpdate()
{ {
if (scrolling)
{
if (tm < srate)
{
tm += Time.deltaTime;
}
else if (!once && tm < srate)
{
tm = 0;
currentObjectRot = Instantiate(objectRot, sn.transform.position, sn.transform.rotation);
}
currentObjectRot.GetComponent<RectTransform>().position = currentObjectRot.GetComponent<RectTransform>().position + (Vector3.forward * movespeed) * Time.deltaTime;
once = true;
}
if (LoadSceneOnObjectActivateOrDeactivate && AdvancedLevelManager) if (LoadSceneOnObjectActivateOrDeactivate && AdvancedLevelManager)
if (RunOnDeactivate) if (RunOnDeactivate)
@@ -182,19 +172,17 @@ namespace JTN
public void SetFullscreen(bool FullscreenState) public void SetFullscreen(bool FullscreenState)
{ {
Debug.Log($"Set fullscreen pref to {FullscreenState}"); Debug.Log($"Set fullscreen pref to {FullscreenState}");
PlayerPrefs.SetString("FullscreenState", $"{FullscreenState}");
if (FullscreenState) if (FullscreenState)
{ {
PlayerPrefs.SetInt("FullscreenState", 1); //Screen.fullScreenMode = FullScreenMode.FullScreenWindow;
Screen.fullScreenMode = FullScreenMode.FullScreenWindow; Screen.SetResolution(1533, 720, true);
Screen.SetResolution(1533, 720, false); } else
}
else
{ {
PlayerPrefs.SetInt("FullscreenState", 0);
Screen.fullScreenMode = FullScreenMode.Windowed; Screen.fullScreenMode = FullScreenMode.Windowed;
Screen.SetResolution(1533, 720, false); Screen.SetResolution(1533, 720, false);
} }
} }
public void DisableAnim(Animation anim) public void DisableAnim(Animation anim)
{ {
File diff suppressed because one or more lines are too long
+1 -2
View File
@@ -139,8 +139,7 @@ PlayerSettings:
vulkanEnableCommandBufferRecycling: 1 vulkanEnableCommandBufferRecycling: 1
loadStoreDebugModeEnabled: 0 loadStoreDebugModeEnabled: 0
bundleVersion: Alpha_0.0.1 bundleVersion: Alpha_0.0.1
preloadedAssets: preloadedAssets: []
- {fileID: 7546540366649888554, guid: 22c363f2b41d45b44bfcde92df2ebb44, type: 2}
metroInputSource: 0 metroInputSource: 0
wsaTransparentSwapchain: 0 wsaTransparentSwapchain: 0
m_HolographicPauseOnTrackingLoss: 1 m_HolographicPauseOnTrackingLoss: 1