提交

Assets/ThirdParty/Rewired/Examples/ControlRemapping1/Scripts/ControlRemappingDemo1.cs

@@ -49,7 +49,7 @@ namespace Rewired.Demos {
         private bool setupFinished;
 
         // Editor state management
-        [NonSerialized]
+        [System.NonSerialized]
         private bool initialized;
         private bool isCompiling;
 
@@ -1009,7 +1009,7 @@ namespace Rewired.Demos {
                 case ElementAssignmentChangeType.ConflictCheck:
                     return ProcessElementAssignmentConflictCheck(entry);
                 default:
-                    throw new NotImplementedException();
+                    throw new System.NotImplementedException();
             }
         }
 
@@ -1141,7 +1141,7 @@ namespace Rewired.Demos {
                     conflictFoundEventData.responseCallback(InputMapper.ConflictResponse.Replace);
                 } else if(entry.response == UserResponse.Custom1) { // add without removing
                     conflictFoundEventData.responseCallback(InputMapper.ConflictResponse.Add);
-                } else throw new NotImplementedException();
+                } else throw new System.NotImplementedException();
 
                 return true; // finished
             }
@@ -1338,11 +1338,11 @@ namespace Rewired.Demos {
         #region Mapping Listener Event Handlers
 
         private void OnConflictFound(InputMapper.ConflictFoundEventData data) {
-            conflictFoundEventData = data;
+            this.conflictFoundEventData = data;
         }
 
         private void OnStopped(InputMapper.StoppedEventData data) {
-            conflictFoundEventData = null;
+            this.conflictFoundEventData = null;
         }
 
         #endregion
@@ -1677,7 +1677,7 @@ namespace Rewired.Demos {
                 bool assign
             )
                 : base(QueueActionType.JoystickAssignment) {
-                playerId = newPlayerId;
+                this.playerId = newPlayerId;
                 this.joystickId = joystickId;
                 this.assign = assign;
             }