Skip to content

Commit 7ff06c4

Browse files
Ibrahimmushtaq98Ibrahimmushtaq98
committed
Merge Conflict merge
1 parent 635c848 commit 7ff06c4

File tree

5 files changed

+37
-30
lines changed

5 files changed

+37
-30
lines changed

‎.vs/RobotON/v15/.suo

123 KB
Binary file not shown.

‎Assembly-CSharp-firstpass.csproj

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -57,37 +57,37 @@
5757
<ItemGroup>
5858
<Compile Include="Assets\Standard Assets\Character Controllers\Sources\Scripts\MouseLook.cs" />
5959
<Reference Include="Unity.Timeline.Editor">
60-
<HintPath>C:/Users/kashi/Documents/RobotON/Library/ScriptAssemblies/Unity.Timeline.Editor.dll</HintPath>
60+
<HintPath>C:/Users/Ibrahim/Desktop/RobotON/Library/ScriptAssemblies/Unity.Timeline.Editor.dll</HintPath>
6161
</Reference>
6262
<Reference Include="Unity.TextMeshPro.Editor">
63-
<HintPath>C:/Users/kashi/Documents/RobotON/Library/ScriptAssemblies/Unity.TextMeshPro.Editor.dll</HintPath>
63+
<HintPath>C:/Users/Ibrahim/Desktop/RobotON/Library/ScriptAssemblies/Unity.TextMeshPro.Editor.dll</HintPath>
6464
</Reference>
6565
<Reference Include="Unity.PackageManagerUI.Editor">
66-
<HintPath>C:/Users/kashi/Documents/RobotON/Library/ScriptAssemblies/Unity.PackageManagerUI.Editor.dll</HintPath>
66+
<HintPath>C:/Users/Ibrahim/Desktop/RobotON/Library/ScriptAssemblies/Unity.PackageManagerUI.Editor.dll</HintPath>
6767
</Reference>
6868
<Reference Include="Unity.Timeline">
69-
<HintPath>C:/Users/kashi/Documents/RobotON/Library/ScriptAssemblies/Unity.Timeline.dll</HintPath>
69+
<HintPath>C:/Users/Ibrahim/Desktop/RobotON/Library/ScriptAssemblies/Unity.Timeline.dll</HintPath>
7070
</Reference>
7171
<Reference Include="Unity.CollabProxy.Editor">
72-
<HintPath>C:/Users/kashi/Documents/RobotON/Library/ScriptAssemblies/Unity.CollabProxy.Editor.dll</HintPath>
72+
<HintPath>C:/Users/Ibrahim/Desktop/RobotON/Library/ScriptAssemblies/Unity.CollabProxy.Editor.dll</HintPath>
7373
</Reference>
7474
<Reference Include="UnityEngine.XR.LegacyInputHelpers">
75-
<HintPath>C:/Users/kashi/Documents/RobotON/Library/ScriptAssemblies/UnityEngine.XR.LegacyInputHelpers.dll</HintPath>
75+
<HintPath>C:/Users/Ibrahim/Desktop/RobotON/Library/ScriptAssemblies/UnityEngine.XR.LegacyInputHelpers.dll</HintPath>
7676
</Reference>
7777
<Reference Include="UnityEditor.SpatialTracking">
78-
<HintPath>C:/Users/kashi/Documents/RobotON/Library/ScriptAssemblies/UnityEditor.SpatialTracking.dll</HintPath>
78+
<HintPath>C:/Users/Ibrahim/Desktop/RobotON/Library/ScriptAssemblies/UnityEditor.SpatialTracking.dll</HintPath>
7979
</Reference>
8080
<Reference Include="UnityEngine.SpatialTracking">
81-
<HintPath>C:/Users/kashi/Documents/RobotON/Library/ScriptAssemblies/UnityEngine.SpatialTracking.dll</HintPath>
81+
<HintPath>C:/Users/Ibrahim/Desktop/RobotON/Library/ScriptAssemblies/UnityEngine.SpatialTracking.dll</HintPath>
8282
</Reference>
8383
<Reference Include="Unity.TextMeshPro">
84-
<HintPath>C:/Users/kashi/Documents/RobotON/Library/ScriptAssemblies/Unity.TextMeshPro.dll</HintPath>
84+
<HintPath>C:/Users/Ibrahim/Desktop/RobotON/Library/ScriptAssemblies/Unity.TextMeshPro.dll</HintPath>
8585
</Reference>
8686
<Reference Include="Unity.Analytics.DataPrivacy">
87-
<HintPath>C:/Users/kashi/Documents/RobotON/Library/ScriptAssemblies/Unity.Analytics.DataPrivacy.dll</HintPath>
87+
<HintPath>C:/Users/Ibrahim/Desktop/RobotON/Library/ScriptAssemblies/Unity.Analytics.DataPrivacy.dll</HintPath>
8888
</Reference>
8989
<Reference Include="UnityEditor.XR.LegacyInputHelpers">
90-
<HintPath>C:/Users/kashi/Documents/RobotON/Library/ScriptAssemblies/UnityEditor.XR.LegacyInputHelpers.dll</HintPath>
90+
<HintPath>C:/Users/Ibrahim/Desktop/RobotON/Library/ScriptAssemblies/UnityEditor.XR.LegacyInputHelpers.dll</HintPath>
9191
</Reference>
9292
<Reference Include="UnityEngine.AIModule">
9393
<HintPath>C:/Program Files/Unity/Hub/Editor/2019.1.0f2/Editor/Data/Managed/UnityEngine/UnityEngine.AIModule.dll</HintPath>
@@ -270,13 +270,13 @@
270270
<HintPath>C:/Program Files/Unity/Hub/Editor/2019.1.0f2/Editor/Data/UnityExtensions/Unity/TestRunner/net35/unity-custom/nunit.framework.dll</HintPath>
271271
</Reference>
272272
<Reference Include="Unity.Analytics.Editor">
273-
<HintPath>C:/Users/kashi/Documents/RobotON/Library/PackageCache/[email protected]/Unity.Analytics.Editor.dll</HintPath>
273+
<HintPath>C:/Users/Ibrahim/Desktop/RobotON/Library/PackageCache/[email protected]/Unity.Analytics.Editor.dll</HintPath>
274274
</Reference>
275275
<Reference Include="Unity.Analytics.StandardEvents">
276-
<HintPath>C:/Users/kashi/Documents/RobotON/Library/PackageCache/[email protected]/Unity.Analytics.StandardEvents.dll</HintPath>
276+
<HintPath>C:/Users/Ibrahim/Desktop/RobotON/Library/PackageCache/[email protected]/Unity.Analytics.StandardEvents.dll</HintPath>
277277
</Reference>
278278
<Reference Include="Unity.Analytics.Tracker">
279-
<HintPath>C:/Users/kashi/Documents/RobotON/Library/PackageCache/[email protected]/Unity.Analytics.Tracker.dll</HintPath>
279+
<HintPath>C:/Users/Ibrahim/Desktop/RobotON/Library/PackageCache/[email protected]/Unity.Analytics.Tracker.dll</HintPath>
280280
</Reference>
281281
<Reference Include="netstandard">
282282
<HintPath>C:/Program Files/Unity/Hub/Editor/2019.1.0f2/Editor/Data/NetStandard/ref/2.0.0/netstandard.dll</HintPath>

‎Assembly-CSharp.csproj

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -366,37 +366,37 @@
366366
<None Include="Assets\StreamingAssets\bugleveldata\level4c.xml" />
367367
<None Include="Assets\StreamingAssets\bugleveldata\python\L4bCloser.xml" />
368368
<Reference Include="Unity.Timeline.Editor">
369-
<HintPath>C:/Users/kashi/Documents/RobotON/Library/ScriptAssemblies/Unity.Timeline.Editor.dll</HintPath>
369+
<HintPath>C:/Users/Ibrahim/Desktop/RobotON/Library/ScriptAssemblies/Unity.Timeline.Editor.dll</HintPath>
370370
</Reference>
371371
<Reference Include="Unity.TextMeshPro.Editor">
372-
<HintPath>C:/Users/kashi/Documents/RobotON/Library/ScriptAssemblies/Unity.TextMeshPro.Editor.dll</HintPath>
372+
<HintPath>C:/Users/Ibrahim/Desktop/RobotON/Library/ScriptAssemblies/Unity.TextMeshPro.Editor.dll</HintPath>
373373
</Reference>
374374
<Reference Include="Unity.PackageManagerUI.Editor">
375-
<HintPath>C:/Users/kashi/Documents/RobotON/Library/ScriptAssemblies/Unity.PackageManagerUI.Editor.dll</HintPath>
375+
<HintPath>C:/Users/Ibrahim/Desktop/RobotON/Library/ScriptAssemblies/Unity.PackageManagerUI.Editor.dll</HintPath>
376376
</Reference>
377377
<Reference Include="Unity.Timeline">
378-
<HintPath>C:/Users/kashi/Documents/RobotON/Library/ScriptAssemblies/Unity.Timeline.dll</HintPath>
378+
<HintPath>C:/Users/Ibrahim/Desktop/RobotON/Library/ScriptAssemblies/Unity.Timeline.dll</HintPath>
379379
</Reference>
380380
<Reference Include="Unity.CollabProxy.Editor">
381-
<HintPath>C:/Users/kashi/Documents/RobotON/Library/ScriptAssemblies/Unity.CollabProxy.Editor.dll</HintPath>
381+
<HintPath>C:/Users/Ibrahim/Desktop/RobotON/Library/ScriptAssemblies/Unity.CollabProxy.Editor.dll</HintPath>
382382
</Reference>
383383
<Reference Include="UnityEngine.XR.LegacyInputHelpers">
384-
<HintPath>C:/Users/kashi/Documents/RobotON/Library/ScriptAssemblies/UnityEngine.XR.LegacyInputHelpers.dll</HintPath>
384+
<HintPath>C:/Users/Ibrahim/Desktop/RobotON/Library/ScriptAssemblies/UnityEngine.XR.LegacyInputHelpers.dll</HintPath>
385385
</Reference>
386386
<Reference Include="UnityEditor.SpatialTracking">
387-
<HintPath>C:/Users/kashi/Documents/RobotON/Library/ScriptAssemblies/UnityEditor.SpatialTracking.dll</HintPath>
387+
<HintPath>C:/Users/Ibrahim/Desktop/RobotON/Library/ScriptAssemblies/UnityEditor.SpatialTracking.dll</HintPath>
388388
</Reference>
389389
<Reference Include="UnityEngine.SpatialTracking">
390-
<HintPath>C:/Users/kashi/Documents/RobotON/Library/ScriptAssemblies/UnityEngine.SpatialTracking.dll</HintPath>
390+
<HintPath>C:/Users/Ibrahim/Desktop/RobotON/Library/ScriptAssemblies/UnityEngine.SpatialTracking.dll</HintPath>
391391
</Reference>
392392
<Reference Include="Unity.TextMeshPro">
393-
<HintPath>C:/Users/kashi/Documents/RobotON/Library/ScriptAssemblies/Unity.TextMeshPro.dll</HintPath>
393+
<HintPath>C:/Users/Ibrahim/Desktop/RobotON/Library/ScriptAssemblies/Unity.TextMeshPro.dll</HintPath>
394394
</Reference>
395395
<Reference Include="Unity.Analytics.DataPrivacy">
396-
<HintPath>C:/Users/kashi/Documents/RobotON/Library/ScriptAssemblies/Unity.Analytics.DataPrivacy.dll</HintPath>
396+
<HintPath>C:/Users/Ibrahim/Desktop/RobotON/Library/ScriptAssemblies/Unity.Analytics.DataPrivacy.dll</HintPath>
397397
</Reference>
398398
<Reference Include="UnityEditor.XR.LegacyInputHelpers">
399-
<HintPath>C:/Users/kashi/Documents/RobotON/Library/ScriptAssemblies/UnityEditor.XR.LegacyInputHelpers.dll</HintPath>
399+
<HintPath>C:/Users/Ibrahim/Desktop/RobotON/Library/ScriptAssemblies/UnityEditor.XR.LegacyInputHelpers.dll</HintPath>
400400
</Reference>
401401
<Reference Include="UnityEngine.AIModule">
402402
<HintPath>C:/Program Files/Unity/Hub/Editor/2019.1.0f2/Editor/Data/Managed/UnityEngine/UnityEngine.AIModule.dll</HintPath>
@@ -579,13 +579,13 @@
579579
<HintPath>C:/Program Files/Unity/Hub/Editor/2019.1.0f2/Editor/Data/UnityExtensions/Unity/TestRunner/net35/unity-custom/nunit.framework.dll</HintPath>
580580
</Reference>
581581
<Reference Include="Unity.Analytics.Editor">
582-
<HintPath>C:/Users/kashi/Documents/RobotON/Library/PackageCache/[email protected]/Unity.Analytics.Editor.dll</HintPath>
582+
<HintPath>C:/Users/Ibrahim/Desktop/RobotON/Library/PackageCache/[email protected]/Unity.Analytics.Editor.dll</HintPath>
583583
</Reference>
584584
<Reference Include="Unity.Analytics.StandardEvents">
585-
<HintPath>C:/Users/kashi/Documents/RobotON/Library/PackageCache/[email protected]/Unity.Analytics.StandardEvents.dll</HintPath>
585+
<HintPath>C:/Users/Ibrahim/Desktop/RobotON/Library/PackageCache/[email protected]/Unity.Analytics.StandardEvents.dll</HintPath>
586586
</Reference>
587587
<Reference Include="Unity.Analytics.Tracker">
588-
<HintPath>C:/Users/kashi/Documents/RobotON/Library/PackageCache/[email protected]/Unity.Analytics.Tracker.dll</HintPath>
588+
<HintPath>C:/Users/Ibrahim/Desktop/RobotON/Library/PackageCache/[email protected]/Unity.Analytics.Tracker.dll</HintPath>
589589
</Reference>
590590
<Reference Include="netstandard">
591591
<HintPath>C:/Program Files/Unity/Hub/Editor/2019.1.0f2/Editor/Data/NetStandard/ref/2.0.0/netstandard.dll</HintPath>

‎Assets/Scripts/rename.cs

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,11 @@ public override void Initialize()
7474
//https://stackoverflow.com/questions/171480/regex-grabbing-values-between-quotation-marks
7575
Regex rgxF = new Regex("\"(.*?)\"");
7676
//Regex rgxFiv = new Regex(oldname+@"\b");
77-
Regex rgxFiv = new Regex(oldname + "(?=[^\"]*(?:\"[^\"]*\"[^\"]*)*$)");
77+
string rgxString = oldname + "(?=[^\"]*(?:\"[^\"]*\"[^\"]*)*$)";
78+
79+
Regex rgxFiv = new Regex(rgxString);
80+
81+
//Debug.Log(oldname + "(?=[^\"]*(?:\"[^\"]*\"[^\"]*)*$)");
7882

7983
//Check if its python or noth
8084
if(GlobalState.Language.ToLower() == "python"){
@@ -91,6 +95,9 @@ public override void Initialize()
9195
GlobalState.level.Code[i] = rgxO.Replace(GlobalState.level.Code[i], "\v" + oldname + "\v");
9296
}else if(rgxO.IsMatch(s) && !s.Contains("'''") && !rgxF.IsMatch(s)){
9397
GlobalState.level.Code[i] = rgxO.Replace(GlobalState.level.Code[i], "<color=#ff00ffff>" + oldname +"</color>");
98+
}else if(rgxO.IsMatch(s) && rgxF.IsMatch(s) && !rgxFiv.IsMatch(s) && !s.Contains("'''")){
99+
Debug.Log(s);
100+
GlobalState.level.Code[i] = rgxO.Replace(GlobalState.level.Code[i], "<color=#ff00ffff>" + oldname +"</color>");
94101
}else if(rgxO.IsMatch(s) || rgxFiv.IsMatch(s)){
95102
GlobalState.level.Code[i] = rgxO.Replace(GlobalState.level.Code[i], "\v" + oldname + "\v");
96103
}

‎Assets/StreamingAssets/onleveldata/levels.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,5 +20,5 @@ level3-3.xml 1
2020
tutorial4.xml 1
2121
level4-0.xml 1
2222
level4-1.xml 1
23-
level4-2.xml 1
23+
level4-2b.xml 1
2424
level4-3.xml 1

0 commit comments

Comments
 (0)