Merge branch 'master' of 161.97.127.136:/home/jerk/zombiemp

Assembly-CSharp-Editor.csproj

@@ -729,6 +729,9 @@
     <Reference Include="Unity.VisualStudio.Editor">
       <HintPath>Library\ScriptAssemblies\Unity.VisualStudio.Editor.dll</HintPath>
     </Reference>
+    <Reference Include="Unity.Sysroot.Linux_x86_64">
+      <HintPath>Library\ScriptAssemblies\Unity.Sysroot.Linux_x86_64.dll</HintPath>
+    </Reference>
     <Reference Include="Unity.Timeline">
       <HintPath>Library\ScriptAssemblies\Unity.Timeline.dll</HintPath>
     </Reference>
@@ -765,6 +768,9 @@
     <Reference Include="Unity.Postprocessing.Runtime">
       <HintPath>Library\ScriptAssemblies\Unity.Postprocessing.Runtime.dll</HintPath>
     </Reference>
+    <Reference Include="Unity.Toolchain.Win-x86_64-Linux-x86_64">
+      <HintPath>Library\ScriptAssemblies\Unity.Toolchain.Win-x86_64-Linux-x86_64.dll</HintPath>
+    </Reference>
     <Reference Include="Unity.Timeline.Editor">
       <HintPath>Library\ScriptAssemblies\Unity.Timeline.Editor.dll</HintPath>
     </Reference>
@@ -774,12 +780,6 @@
     <Reference Include="Unity.Animation.Rigging.Editor">
       <HintPath>Library\ScriptAssemblies\Unity.Animation.Rigging.Editor.dll</HintPath>
     </Reference>
-    <Reference Include="Unity.Sysroot.Linux_x86_64">
-      <HintPath>Library\ScriptAssemblies\Unity.Sysroot.Linux_x86_64.dll</HintPath>
-    </Reference>
-    <Reference Include="Unity.Toolchain.Win-x86_64-Linux-x86_64">
-      <HintPath>Library\ScriptAssemblies\Unity.Toolchain.Win-x86_64-Linux-x86_64.dll</HintPath>
-    </Reference>
     <Reference Include="Unity.SysrootPackage.Editor">
       <HintPath>Library\ScriptAssemblies\Unity.SysrootPackage.Editor.dll</HintPath>
     </Reference>
@@ -797,6 +797,10 @@
       <Project>{0B70AC3F-E640-9FC3-22FD-95B240B25E58}</Project>
       <Name>kcp2k</Name>
     </ProjectReference>
+    <ProjectReference Include="LRM.csproj">
+      <Project>{CF66EF3D-4050-DF05-DA77-CF9AE4A7A73F}</Project>
+      <Name>LRM</Name>
+    </ProjectReference>
     <ProjectReference Include="Mirror.Examples.csproj">
       <Project>{8DDBC216-C26B-5BFD-713C-0991301A952A}</Project>
       <Name>Mirror.Examples</Name>

Assets/3dModels/ze_no_parking/floor only.blend.meta

@@ -36,7 +36,7 @@ ModelImporter:
     extraExposedTransformPaths: []
     extraUserProperties: []
     clipAnimations: []
-    isReadable: 0
+    isReadable: 1
   meshes:
     lODScreenPercentages: []
     globalScale: 1

Assets/3dModels/ze_no_parking/floor only.fbx.meta

@@ -31,7 +31,7 @@ ModelImporter:
     extraExposedTransformPaths: []
     extraUserProperties: []
     clipAnimations: []
-    isReadable: 0
+    isReadable: 1
   meshes:
     lODScreenPercentages: []
     globalScale: 1

Assets/3dModels/zf_surf/normal.png.meta

@@ -7,7 +7,7 @@ TextureImporter:
   mipmaps:
     mipMapMode: 0
     enableMipMap: 1
-    sRGBTexture: 1
+    sRGBTexture: 0
     linearTexture: 0
     fadeOut: 0
     borderMipMap: 0
@@ -52,7 +52,7 @@ TextureImporter:
   alphaUsage: 1
   alphaIsTransparency: 0
   spriteTessellationDetail: -1
-  textureType: 0
+  textureType: 1
   textureShape: 1
   singleChannelComponent: 0
   flipbookRows: 1

Assets/Scenes/menu.unity

@@ -38,7 +38,7 @@ RenderSettings:
   m_ReflectionIntensity: 1
   m_CustomReflection: {fileID: 0}
   m_Sun: {fileID: 0}
-  m_IndirectSpecularColor: {r: 0.3731193, g: 0.38073996, b: 0.35872698, a: 1}
+  m_IndirectSpecularColor: {r: 0.37311953, g: 0.38074014, b: 0.3587274, a: 1}
   m_UseRadianceAmbientProbe: 0
 --- !u!157 &3
 LightmapSettings:

Assets/Scripts/Menu/menuController.cs

@@ -48,11 +48,12 @@ public class menuController : MonoBehaviour
         //clear all entries
         foreach(Transform t in scrollParent) { Destroy(t.gameObject); }
         bool b1 = false;
-        for(int i =0; i < _LRM.relayServerList.Count; i++)
+        modSelector ModSelector = FindObjectOfType<modSelector>();
+        for (int i =0; i < _LRM.relayServerList.Count; i++)
         {
-            int mapId = int.Parse(_LRM.relayServerList[i].serverName.Substring(0, 1));
-
-            if(mapId == FindObjectOfType<modSelector>().currentSelectedId)
+            //int mapId = int.Parse(_LRM.relayServerList[i].serverName.Substring(0, 1));
+            if(NetworkManager.singleton.onlineScene == ModSelector.scenes[ModSelector.currentSelectedId])
+          //  if(mapId == FindObjectOfType<modSelector>().currentSelectedId)
             {
                 GameObject go = Instantiate(serverRow, scrollParent);
                 go.transform.GetChild(0).GetComponent<Text>().text = _LRM.relayServerList[i].serverName;
@@ -92,8 +93,9 @@ public class menuController : MonoBehaviour
     {
         if (serverNameInput.text.Length > 3)
         {
-            
-            _LRM.serverName = FindObjectOfType<modSelector>().currentSelectedId+serverNameInput.text;
+            modSelector ModSelector = FindObjectOfType<modSelector>();
+            _LRM.serverName = serverNameInput.text;
+            _LRM.extraServerData = ModSelector.scenes[ModSelector.currentSelectedId];
             _LRM.isPublicServer = !isPrivate.isOn;
 
             _LRM.ServerStart();

obj/Debug/Assembly-CSharp-Editor.csproj.CoreCompileInputs.cache

@@ -1 +1 @@
-86157c8362cf093f32a7ab9becceb2c62f501a02
+8fc16b9815aa7ef73e5f80bbf7f43deede4928f8

obj/Debug/Assembly-CSharp.csproj.CoreCompileInputs.cache

@@ -1 +1 @@
-bb82c732cded349bc02642acff42591ca26f8266
+fe8dc2ce120dfe034d83c490ba2bf48624cfba55

obj/Debug/LRM.csproj.CoreCompileInputs.cache

@@ -1 +1 @@
-98f412dcc0859910fe05986de43ea6dd45d8524e
+c95c421924f92f114022dfc58c826723a5abb76d

s

@@ -0,0 +1,48 @@
+commit 458ba77a2f48211a08fd5d8fdb6d693d32b40f67 (HEAD -> master, origin/master)
+Author: Sewmina Dilshan <Sewmina>
+Date:   Wed Aug 25 12:33:38 2021 +0530
+
+    Menu + Server List Done
+
+commit b03c2150d448ceaf282be7622ef7a16199125e98
+Author: Sewmina Dilshan <Sewmina>
+Date:   Mon Aug 23 23:23:20 2021 +0530
+
+    fixed disconnecting
+
+commit bf9076850871e3f2a57de80868d2416a4360f6b9
+Merge: 62cd8f6 c95a54d
+Author: Sewmina Dilshan <Sewmina>
+Date:   Mon Aug 23 21:21:59 2021 +0530
+
+    first test
+
+commit 62cd8f68352df0f4f33fa007e1963bd09b2774c1
+Author: Sewmina Dilshan <Sewmina>
+Date:   Mon Aug 23 21:13:19 2021 +0530
+
+    before pulling
+
+commit c95a54dace4cf3733823269953614a5bc163b79d
+Author: flok1 <dewnuwan.jayaweera7@gmail.com>
+Date:   Mon Aug 23 21:00:24 2021 +0530
+
+    Did some adjusments in killcave scene - flok1
+
+commit 7426fb55ac1150c4fb5513c11f2aea4a684b742a
+Author: flok1 <dewnuwan.jayaweera7@gmail.com>
+Date:   Mon Aug 23 19:28:40 2021 +0530
+
+    ze_no_parking scene added - flok1
+
+commit 7f65c3a85734acd2cd3ec4a5a56b895ae0d1311e
+Author: Sewmina Dilshan <Sewmina>
+Date:   Mon Aug 23 15:22:35 2021 +0530
+
+    kill cave floor fixed
+
+commit 68183e5317d7557b337b1aaf4d3f2ea64656a52d
+Author: Sewmina Dilshan <Sewmina>
+Date:   Mon Aug 23 13:28:33 2021 +0530
+
+    initial