jonas/flufflparty-
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Buf Fix Deactivate

Browse Source
This commit is contained in:
brausjonas
2023-03-28 19:33:56 +02:00
parent 74100f4528
commit 3726104d4e
5 changed files with 1071 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
FlufflParty/.idea/.idea.FlufflParty/.idea/workspace.xml
Generated
+18 -25
View File
@@ -1,14 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<project version="4"> <project version="4">
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="f0abe486-ee58-49bd-ad63-04a8b3fc78ec" name="Changes" comment=""> <list default="true" id="f0abe486-ee58-49bd-ad63-04a8b3fc78ec" name="Changes" comment="" />
<change beforePath="$PROJECT_DIR$/.idea/.idea.FlufflParty/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/.idea.FlufflParty/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Assets/Scripts/Client.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Scripts/Client.cs" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Assets/Scripts/Players/NoPlayablePlayer.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Scripts/Players/NoPlayablePlayer.cs" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Assets/Scripts/Players/PlayablePlayer.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Scripts/Players/PlayablePlayer.cs" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Assets/Scripts/UIHandler.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Scripts/UIHandler.cs" afterDir="false" />
<change beforePath="$PROJECT_DIR$/UserSettings/Layouts/default-2021.dwlt" beforeDir="false" afterPath="$PROJECT_DIR$/UserSettings/Layouts/default-2021.dwlt" afterDir="false" />
</list>
<option name="SHOW_DIALOG" value="false" /> <option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" /> <option name="HIGHLIGHT_CONFLICTS" value="true" />
<option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" /> <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
@@ -40,22 +33,22 @@
<option name="hideEmptyMiddlePackages" value="true" /> <option name="hideEmptyMiddlePackages" value="true" />
<option name="showLibraryContents" value="true" /> <option name="showLibraryContents" value="true" />
</component> </component>
<component name="PropertiesComponent">{ <component name="PropertiesComponent"><![CDATA[{
&quot;keyToString&quot;: { "keyToString": {
&quot;Discover.Launch.Via.Unity&quot;: &quot;true&quot;, "Discover.Launch.Via.Unity": "true",
&quot;RunOnceActivity.OpenProjectViewOnStart&quot;: &quot;true&quot;, "RunOnceActivity.OpenProjectViewOnStart": "true",
&quot;RunOnceActivity.ShowReadmeOnStart&quot;: &quot;true&quot;, "RunOnceActivity.ShowReadmeOnStart": "true",
&quot;WebServerToolWindowFactoryState&quot;: &quot;false&quot;, "WebServerToolWindowFactoryState": "false",
&quot;vue.rearranger.settings.migration&quot;: &quot;true&quot; "vue.rearranger.settings.migration": "true"
}, },
&quot;keyToStringList&quot;: { "keyToStringList": {
&quot;rider.external.source.directories&quot;: [ "rider.external.source.directories": [
&quot;C:\\Users\\afist\\AppData\\Roaming\\JetBrains\\Rider2022.3\\resharper-host\\DecompilerCache&quot;, "C:\\Users\\braus\\AppData\\Roaming\\JetBrains\\Rider2022.3\\resharper-host\\DecompilerCache",
&quot;C:\\Users\\afist\\AppData\\Roaming\\JetBrains\\Rider2022.3\\resharper-host\\SourcesCache&quot;, "C:\\Users\\braus\\AppData\\Roaming\\JetBrains\\Rider2022.3\\resharper-host\\SourcesCache",
&quot;C:\\Users\\afist\\AppData\\Local\\Symbols\\src&quot; "C:\\Users\\braus\\AppData\\Local\\Symbols\\src"
] ]
} }
}</component> }]]></component>
<component name="RunManager" selected="Attach to Unity Editor.Attach to Unity Editor"> <component name="RunManager" selected="Attach to Unity Editor.Attach to Unity Editor">
<configuration name="Standalone Player" type="RunUnityExe" factoryName="Unity Executable"> <configuration name="Standalone Player" type="RunUnityExe" factoryName="Unity Executable">
<option name="EXE_PATH" value="$USER_HOME$/OneDrive/Desktop/FlufflPartyBuild\FlufflParty.exe" /> <option name="EXE_PATH" value="$USER_HOME$/OneDrive/Desktop/FlufflPartyBuild\FlufflParty.exe" />
@@ -66,7 +59,7 @@
<method v="2" /> <method v="2" />
</configuration> </configuration>
<configuration name="Start Unity" type="RunUnityExe" factoryName="Unity Executable"> <configuration name="Start Unity" type="RunUnityExe" factoryName="Unity Executable">
<option name="EXE_PATH" value="C:\Program Files\Unity\Hub\Editor\2021.3.17f1\Editor\Unity.exe" /> <option name="EXE_PATH" value="C:\Program Files\Unity\Hub\Editor\2021.3.16f1\Editor\Unity.exe" />
<option name="PROGRAM_PARAMETERS" value="-projectPath F:\Projects\Unity\flufflparty\FlufflParty -debugCodeOptimization" /> <option name="PROGRAM_PARAMETERS" value="-projectPath F:\Projects\Unity\flufflparty\FlufflParty -debugCodeOptimization" />
<option name="WORKING_DIRECTORY" value="F:\Projects\Unity\flufflparty\FlufflParty" /> <option name="WORKING_DIRECTORY" value="F:\Projects\Unity\flufflparty\FlufflParty" />
<option name="PASS_PARENT_ENVS" value="1" /> <option name="PASS_PARENT_ENVS" value="1" />
@@ -74,7 +67,7 @@
<method v="2" /> <method v="2" />
</configuration> </configuration>
<configuration name="UnitTests (batch mode)" type="RunUnityExe" factoryName="Unity Executable"> <configuration name="UnitTests (batch mode)" type="RunUnityExe" factoryName="Unity Executable">
<option name="EXE_PATH" value="C:\Program Files\Unity\Hub\Editor\2021.3.17f1\Editor\Unity.exe" /> <option name="EXE_PATH" value="C:\Program Files\Unity\Hub\Editor\2021.3.16f1\Editor\Unity.exe" />
<option name="PROGRAM_PARAMETERS" value="-runTests -batchmode -projectPath F:\Projects\Unity\flufflparty\FlufflParty -testResults Logs/results.xml -testPlatform EditMode -debugCodeOptimization" /> <option name="PROGRAM_PARAMETERS" value="-runTests -batchmode -projectPath F:\Projects\Unity\flufflparty\FlufflParty -testResults Logs/results.xml -testPlatform EditMode -debugCodeOptimization" />
<option name="WORKING_DIRECTORY" value="F:\Projects\Unity\flufflparty\FlufflParty" /> <option name="WORKING_DIRECTORY" value="F:\Projects\Unity\flufflparty\FlufflParty" />
<option name="PASS_PARENT_ENVS" value="1" /> <option name="PASS_PARENT_ENVS" value="1" />
@@ -142,8 +135,8 @@
<workItem from="1677881158579" duration="8577000" /> <workItem from="1677881158579" duration="8577000" />
<workItem from="1678046412549" duration="3738000" /> <workItem from="1678046412549" duration="3738000" />
<workItem from="1679426348887" duration="3549000" /> <workItem from="1679426348887" duration="3549000" />
<workItem from="1679597961773" duration="4891000" /> <workItem from="1679597961773" duration="4070000" />
<workItem from="1680022152724" duration="2273000" /> <workItem from="1680022248953" duration="2534000" />
</task> </task>
<servers /> <servers />
</component> </component>
FlufflParty/Assets/Scripts/Players/NoPlayablePlayer.cs
+2 -6
View File
@@ -129,14 +129,10 @@ public class NoPlayablePlayer : Player
} }
else else
{ {
if (!checkDoubleDice) if (checkDoubleDice)
{
activated = false;
}
else
{ {
checkDoubleDice = false; checkDoubleDice = false;
wurfelt = false; wurfelt = false;
} }
} }
} }
FlufflParty/UserSettings/EditorUserSettings.asset
+2 -2
View File
@@ -12,10 +12,10 @@ EditorUserSettings:
value: 55010d0300055a5a595a592641730d44104e4c287b2e71662c7b186bb3b86069 value: 55010d0300055a5a595a592641730d44104e4c287b2e71662c7b186bb3b86069
flags: 0 flags: 0
RecentlyUsedSceneGuid-2: RecentlyUsedSceneGuid-2:
value: 0000025f04075d0f0c0a5c7149205a4417154f782e7923357e7a4560e3b4653b value: 5a5757560101590a5d0c0e24427b5d44434e4c7a7b7a23677f2b4565b7b5353a
flags: 0 flags: 0
RecentlyUsedSceneGuid-3: RecentlyUsedSceneGuid-3:
value: 5a5757560101590a5d0c0e24427b5d44434e4c7a7b7a23677f2b4565b7b5353a value: 0000025f04075d0f0c0a5c7149205a4417154f782e7923357e7a4560e3b4653b
flags: 0 flags: 0
UnityRemoteDevice: UnityRemoteDevice:
value: 225f4d46245b0d4902070862342649191512 value: 225f4d46245b0d4902070862342649191512
FlufflParty/UserSettings/Layouts/CurrentMaximizeLayout.dwlt
+1048
View File
File diff suppressed because it is too large Load Diff
Server/.idea/workspace.xml
Generated
+1 -1
View File
@@ -90,7 +90,7 @@
<workItem from="1677520608630" duration="13000" /> <workItem from="1677520608630" duration="13000" />
<workItem from="1677789901008" duration="661000" /> <workItem from="1677789901008" duration="661000" />
<workItem from="1677881295823" duration="3489000" /> <workItem from="1677881295823" duration="3489000" />
<workItem from="1680022478274" duration="1038000" /> <workItem from="1680022478274" duration="1591000" />
</task> </task>
<servers /> <servers />
</component> </component>