Skip to content

Commit a7dd332

Browse files
authored
CHANGE: Composite rebinding ui (#758)
1 parent da23c81 commit a7dd332

File tree

18 files changed

+983
-248
lines changed

18 files changed

+983
-248
lines changed

Assets/TanksDemo/Assets/Prefabs/Tank.prefab

Lines changed: 23 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -4678,7 +4678,7 @@ ParticleSystem:
46784678
--- !u!199 &2855894493458006687
46794679
ParticleSystemRenderer:
46804680
serializedVersion: 6
4681-
m_ObjectHideFlags: 2
4681+
m_ObjectHideFlags: 0
46824682
m_CorrespondingSourceObject: {fileID: 0}
46834683
m_PrefabInstance: {fileID: 0}
46844684
m_PrefabAsset: {fileID: 0}
@@ -4702,6 +4702,7 @@ ParticleSystemRenderer:
47024702
m_ProbeAnchor: {fileID: 0}
47034703
m_LightProbeVolumeOverride: {fileID: 0}
47044704
m_ScaleInLightmap: 1
4705+
m_ReceiveGI: 1
47054706
m_PreserveUVs: 0
47064707
m_IgnoreNormalsForChartDetection: 0
47074708
m_ImportantGI: 0
@@ -5081,16 +5082,16 @@ MonoBehaviour:
50815082
m_DeviceLostEvent:
50825083
m_PersistentCalls:
50835084
m_Calls: []
5084-
m_TypeName: UnityEngine.InputSystem.Plugins.PlayerInput.PlayerInput+DeviceLostEvent,
5085-
Unity.InputSystem, Version=0.2.9.0, Culture=neutral, PublicKeyToken=null
5085+
m_TypeName: UnityEngine.InputSystem.PlayerInput.PlayerInput+DeviceLostEvent, Unity.InputSystem,
5086+
Version=0.9.1.0, Culture=neutral, PublicKeyToken=null
50865087
m_DeviceRegainedEvent:
50875088
m_PersistentCalls:
50885089
m_Calls: []
5089-
m_TypeName: UnityEngine.InputSystem.Plugins.PlayerInput.PlayerInput+DeviceRegainedEvent,
5090-
Unity.InputSystem, Version=0.2.9.0, Culture=neutral, PublicKeyToken=null
5090+
m_TypeName: UnityEngine.InputSystem.PlayerInput.PlayerInput+DeviceRegainedEvent,
5091+
Unity.InputSystem, Version=0.9.1.0, Culture=neutral, PublicKeyToken=null
50915092
m_ActionEvents: []
50925093
m_AutoSwitchControlScheme: 0
5093-
m_DefaultControlScheme: Gamepad
5094+
m_DefaultControlScheme:
50945095
m_DefaultActionMap: 4eb03da7-841a-4915-b34d-cf922124fb1d
50955096
m_SplitScreenIndex: -1
50965097
m_Camera: {fileID: 0}
@@ -5164,7 +5165,7 @@ MonoBehaviour:
51645165
m_GameObject: {fileID: 2855894493477825447}
51655166
m_Enabled: 1
51665167
m_EditorHideFlags: 0
5167-
m_Script: {fileID: 1980459831, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3}
5168+
m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3}
51685169
m_Name:
51695170
m_EditorClassIdentifier:
51705171
m_UiScaleMode: 0
@@ -5186,7 +5187,7 @@ MonoBehaviour:
51865187
m_GameObject: {fileID: 2855894493477825447}
51875188
m_Enabled: 1
51885189
m_EditorHideFlags: 0
5189-
m_Script: {fileID: 1301386320, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3}
5190+
m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3}
51905191
m_Name:
51915192
m_EditorClassIdentifier:
51925193
m_IgnoreReversedGraphics: 1
@@ -5240,7 +5241,7 @@ MonoBehaviour:
52405241
m_GameObject: {fileID: 2855894493477827745}
52415242
m_Enabled: 1
52425243
m_EditorHideFlags: 0
5243-
m_Script: {fileID: -113659843, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3}
5244+
m_Script: {fileID: 11500000, guid: 67db9e8f0e2ae9c40bc1e2b64352a6b4, type: 3}
52445245
m_Name:
52455246
m_EditorClassIdentifier:
52465247
m_Navigation:
@@ -5371,7 +5372,7 @@ MonoBehaviour:
53715372
m_GameObject: {fileID: 2855894493477833987}
53725373
m_Enabled: 1
53735374
m_EditorHideFlags: 0
5374-
m_Script: {fileID: -765806418, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3}
5375+
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
53755376
m_Name:
53765377
m_EditorClassIdentifier:
53775378
m_Material: {fileID: 0}
@@ -5391,6 +5392,7 @@ MonoBehaviour:
53915392
m_FillClockwise: 1
53925393
m_FillOrigin: 0
53935394
m_UseSpriteMesh: 0
5395+
m_PixelsPerUnitMultiplier: 1
53945396
--- !u!1 &2855894493477838955
53955397
GameObject:
53965398
m_ObjectHideFlags: 0
@@ -5457,6 +5459,7 @@ MeshRenderer:
54575459
m_ProbeAnchor: {fileID: 0}
54585460
m_LightProbeVolumeOverride: {fileID: 0}
54595461
m_ScaleInLightmap: 1
5462+
m_ReceiveGI: 1
54605463
m_PreserveUVs: 0
54615464
m_IgnoreNormalsForChartDetection: 0
54625465
m_ImportantGI: 0
@@ -5589,7 +5592,7 @@ MonoBehaviour:
55895592
m_GameObject: {fileID: 2855894493477859027}
55905593
m_Enabled: 1
55915594
m_EditorHideFlags: 0
5592-
m_Script: {fileID: -113659843, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3}
5595+
m_Script: {fileID: 11500000, guid: 67db9e8f0e2ae9c40bc1e2b64352a6b4, type: 3}
55935596
m_Name:
55945597
m_EditorClassIdentifier:
55955598
m_Navigation:
@@ -5699,7 +5702,7 @@ MonoBehaviour:
56995702
m_GameObject: {fileID: 2855894493477860423}
57005703
m_Enabled: 1
57015704
m_EditorHideFlags: 0
5702-
m_Script: {fileID: -765806418, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3}
5705+
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
57035706
m_Name:
57045707
m_EditorClassIdentifier:
57055708
m_Material: {fileID: 0}
@@ -5719,6 +5722,7 @@ MonoBehaviour:
57195722
m_FillClockwise: 1
57205723
m_FillOrigin: 0
57215724
m_UseSpriteMesh: 0
5725+
m_PixelsPerUnitMultiplier: 1
57225726
--- !u!1 &2855894493477869301
57235727
GameObject:
57245728
m_ObjectHideFlags: 0
@@ -5785,6 +5789,7 @@ MeshRenderer:
57855789
m_ProbeAnchor: {fileID: 0}
57865790
m_LightProbeVolumeOverride: {fileID: 0}
57875791
m_ScaleInLightmap: 1
5792+
m_ReceiveGI: 1
57885793
m_PreserveUVs: 0
57895794
m_IgnoreNormalsForChartDetection: 0
57905795
m_ImportantGI: 0
@@ -10445,7 +10450,7 @@ ParticleSystem:
1044510450
--- !u!199 &2855894493458097851
1044610451
ParticleSystemRenderer:
1044710452
serializedVersion: 6
10448-
m_ObjectHideFlags: 2
10453+
m_ObjectHideFlags: 0
1044910454
m_CorrespondingSourceObject: {fileID: 0}
1045010455
m_PrefabInstance: {fileID: 0}
1045110456
m_PrefabAsset: {fileID: 0}
@@ -10469,6 +10474,7 @@ ParticleSystemRenderer:
1046910474
m_ProbeAnchor: {fileID: 0}
1047010475
m_LightProbeVolumeOverride: {fileID: 0}
1047110476
m_ScaleInLightmap: 1
10477+
m_ReceiveGI: 1
1047210478
m_PreserveUVs: 0
1047310479
m_IgnoreNormalsForChartDetection: 0
1047410480
m_ImportantGI: 0
@@ -10558,7 +10564,7 @@ MonoBehaviour:
1055810564
m_GameObject: {fileID: 2855894493477880197}
1055910565
m_Enabled: 1
1056010566
m_EditorHideFlags: 0
10561-
m_Script: {fileID: -765806418, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3}
10567+
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
1056210568
m_Name:
1056310569
m_EditorClassIdentifier:
1056410570
m_Material: {fileID: 0}
@@ -10578,6 +10584,7 @@ MonoBehaviour:
1057810584
m_FillClockwise: 0
1057910585
m_FillOrigin: 3
1058010586
m_UseSpriteMesh: 0
10587+
m_PixelsPerUnitMultiplier: 1
1058110588
--- !u!1 &2855894493477892337
1058210589
GameObject:
1058310590
m_ObjectHideFlags: 0
@@ -10644,6 +10651,7 @@ MeshRenderer:
1064410651
m_ProbeAnchor: {fileID: 0}
1064510652
m_LightProbeVolumeOverride: {fileID: 0}
1064610653
m_ScaleInLightmap: 1
10654+
m_ReceiveGI: 1
1064710655
m_PreserveUVs: 0
1064810656
m_IgnoreNormalsForChartDetection: 0
1064910657
m_ImportantGI: 0
@@ -10723,6 +10731,7 @@ MeshRenderer:
1072310731
m_ProbeAnchor: {fileID: 0}
1072410732
m_LightProbeVolumeOverride: {fileID: 0}
1072510733
m_ScaleInLightmap: 1
10734+
m_ReceiveGI: 1
1072610735
m_PreserveUVs: 0
1072710736
m_IgnoreNormalsForChartDetection: 0
1072810737
m_ImportantGI: 0

0 commit comments

Comments
 (0)