@@ -398,10 +398,10 @@ public void LoadFromJson(string json)
398
398
throw new ArgumentNullException ( nameof ( json ) ) ;
399
399
400
400
var parsedJson = JsonUtility . FromJson < ReadFileJson > ( json ) ;
401
- if ( ( parsedJson . maps ? . Length ?? 0 ) > 0 && ( parsedJson . version ?? 0 ) < JsonVersion . Current )
402
- {
403
- MigrateJson ( ref parsedJson ) ;
404
- }
401
+ // if ((parsedJson.maps?.Length ?? 0) > 0 && (parsedJson.version ?? 0) < JsonVersion.Version1 )
402
+ // {
403
+ MigrateJson ( ref parsedJson ) ;
404
+ // }
405
405
406
406
parsedJson . ToAsset ( this ) ;
407
407
}
@@ -1015,64 +1015,67 @@ public void ToAsset(InputActionAsset asset)
1015
1015
/// </summary>
1016
1016
internal void MigrateJson ( ref ReadFileJson parsedJson )
1017
1017
{
1018
- var existing = parsedJson . version ?? JsonVersion . Version0 ;
1018
+ var existing = parsedJson . version ?? JsonVersion . Version1 ;
1019
1019
if ( existing >= JsonVersion . Current )
1020
1020
return ;
1021
1021
1022
- for ( var mi = 0 ; mi < parsedJson . maps . Length ; ++ mi )
1022
+ if ( ( parsedJson . maps ? . Length ?? 0 ) > 0 && ( parsedJson . version ?? 0 ) < JsonVersion . Version1 )
1023
1023
{
1024
- var mapJson = parsedJson . maps [ mi ] ;
1025
- for ( var ai = 0 ; ai < mapJson . actions . Length ; ++ ai )
1024
+ for ( var mi = 0 ; mi < parsedJson . maps . Length ; ++ mi )
1026
1025
{
1027
- var actionJson = mapJson . actions [ ai ] ;
1028
- var raw = actionJson . processors ;
1029
- if ( string . IsNullOrEmpty ( raw ) )
1030
- continue ;
1031
-
1032
- var list = NameAndParameters . ParseMultiple ( raw ) . ToList ( ) ;
1033
- var rebuilt = new List < string > ( list . Count ) ;
1034
- foreach ( var nap in list )
1026
+ var mapJson = parsedJson . maps [ mi ] ;
1027
+ for ( var ai = 0 ; ai < mapJson . actions . Length ; ++ ai )
1035
1028
{
1036
- var procType = InputSystem . TryGetProcessor ( nap . name ) ;
1037
- if ( nap . parameters . Count == 0 || procType == null )
1038
- {
1039
- rebuilt . Add ( nap . ToString ( ) ) ;
1029
+ var actionJson = mapJson . actions [ ai ] ;
1030
+ var raw = actionJson . processors ;
1031
+ if ( string . IsNullOrEmpty ( raw ) )
1040
1032
continue ;
1041
- }
1042
1033
1043
- var dict = nap . parameters . ToDictionary ( p => p . name , p => p . value . ToString ( ) ) ;
1044
- var anyChanged = false ;
1045
- foreach ( var field in procType . GetFields ( BindingFlags . Public | BindingFlags . Instance ) . Where ( f => f . FieldType . IsEnum ) )
1034
+ var list = NameAndParameters . ParseMultiple ( raw ) . ToList ( ) ;
1035
+ var rebuilt = new List < string > ( list . Count ) ;
1036
+ foreach ( var nap in list )
1046
1037
{
1047
- if ( dict . TryGetValue ( field . Name , out var ordS ) && int . TryParse ( ordS , out var ord ) )
1038
+ var procType = InputSystem . TryGetProcessor ( nap . name ) ;
1039
+ if ( nap . parameters . Count == 0 || procType == null )
1048
1040
{
1049
- var values = Enum . GetValues ( field . FieldType ) . Cast < object > ( ) . ToArray ( ) ;
1050
- if ( ord >= 0 && ord < values . Length )
1041
+ rebuilt . Add ( nap . ToString ( ) ) ;
1042
+ continue ;
1043
+ }
1044
+
1045
+ var dict = nap . parameters . ToDictionary ( p => p . name , p => p . value . ToString ( ) ) ;
1046
+ var anyChanged = false ;
1047
+ foreach ( var field in procType . GetFields ( BindingFlags . Public | BindingFlags . Instance ) . Where ( f => f . FieldType . IsEnum ) )
1048
+ {
1049
+ if ( dict . TryGetValue ( field . Name , out var ordS ) && int . TryParse ( ordS , out var ord ) )
1051
1050
{
1052
- dict [ field . Name ] = Convert . ToInt32 ( values [ ord ] ) . ToString ( ) ;
1053
- anyChanged = true ;
1051
+ var values = Enum . GetValues ( field . FieldType ) . Cast < object > ( ) . ToArray ( ) ;
1052
+ if ( ord >= 0 && ord < values . Length )
1053
+ {
1054
+ dict [ field . Name ] = Convert . ToInt32 ( values [ ord ] ) . ToString ( ) ;
1055
+ anyChanged = true ;
1056
+ }
1054
1057
}
1055
1058
}
1056
- }
1057
1059
1058
- if ( ! anyChanged )
1059
- {
1060
- rebuilt . Add ( nap . ToString ( ) ) ;
1061
- }
1062
- else
1063
- {
1064
- var paramText = string . Join ( "," , dict . Select ( kv => $ "{ kv . Key } ={ kv . Value } ") ) ;
1065
- rebuilt . Add ( $ "{ nap . name } ({ paramText } )") ;
1060
+ if ( ! anyChanged )
1061
+ {
1062
+ rebuilt . Add ( nap . ToString ( ) ) ;
1063
+ }
1064
+ else
1065
+ {
1066
+ var paramText = string . Join ( "," , dict . Select ( kv => $ "{ kv . Key } ={ kv . Value } ") ) ;
1067
+ rebuilt . Add ( $ "{ nap . name } ({ paramText } )") ;
1068
+ }
1066
1069
}
1067
- }
1068
1070
1069
- actionJson . processors = string . Join ( ";" , rebuilt ) ;
1070
- mapJson . actions [ ai ] = actionJson ;
1071
+ actionJson . processors = string . Join ( ";" , rebuilt ) ;
1072
+ mapJson . actions [ ai ] = actionJson ;
1073
+ }
1074
+ parsedJson . maps [ mi ] = mapJson ;
1071
1075
}
1072
- parsedJson . maps [ mi ] = mapJson ;
1073
1076
}
1074
1077
// Bump the version so we never re-migrate
1075
- parsedJson . version = JsonVersion . Current ;
1078
+ parsedJson . version = JsonVersion . Version1 ;
1076
1079
}
1077
1080
}
1078
1081
}
0 commit comments