Skip to content

GitLab

  • Menu
    • Projects Groups Snippets
      Help
Projects Groups Snippets
  • Help
    • Help
    • Support
    • Community forum
    • Submit feedback
    • Contribute to GitLab
  • Sign in / Register
  • I Inversia
  • Project information
    • Project information
    • Activity
    • Labels
    • Members
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributors
    • Graph
    • Compare
  • Issues 0
    • Issues 0
    • List
    • Boards
    • Service Desk
    • Milestones
  • Merge requests 0
    • Merge requests 0
  • CI/CD
    • CI/CD
    • Pipelines
    • Jobs
    • Schedules
  • Deployments
    • Deployments
    • Environments
    • Releases
  • Monitor
    • Monitor
    • Incidents
  • Packages & Registries
    • Packages & Registries
    • Package Registry
    • Container Registry
    • Infrastructure Registry
  • Analytics
    • Analytics
    • Value stream
    • CI/CD
    • Repository
  • Wiki
    • Wiki
  • Snippets
    • Snippets
  • Activity
  • Graph
  • Create a new issue
  • Jobs
  • Commits
  • Issue Boards
Collapse sidebar
  • public-projects
  • Inversia
  • Merge requests
  • !18

Merged
Created 2 years ago by Егор Парфенов@eiparfenovDeveloper

Build for dod

  • Overview 0
  • Commits 26
  • Changes 88

The last workable version

  • Дмитрий Макаров @mentoster approved this merge request 2 years ago

    approved this merge request

  • Дмитрий Макаров @mentoster mentioned in commit 98e4ea2d 2 years ago

    mentioned in commit 98e4ea2d

  • Дмитрий Макаров @mentoster merged 2 years ago

    merged

  • You're only seeing other activity in the feed. To add a comment, switch to one of the following options.
Please register or sign in to reply
Compare
  • master (base)

and
  • latest version
    43ad1560
    26 commits, 2 years ago

88 files
+ 9785
- 942

    Preferences

    File browser
    Compare changes
Ass‎ets‎
GamePlay‎/Scripts‎
GuidMan‎ager.cs‎ +2 -2
PlayMan‎ager.cs‎ +7 -2
Grap‎hics‎
Mate‎rials‎
Envir‎oment‎
EnvBottomNo‎iseMat 1.mat‎ +3 -3
WallParti‎cleMat.mat‎ +2 -2
Ma‎in‎
NeonMa‎t0.mat‎ +2 -2
NeonMa‎t1.mat‎ +2 -2
NeonMa‎t2.mat‎ +2 -2
NeonMa‎t3.mat‎ +2 -2
NeonMa‎t4.mat‎ +2 -2
NeonMa‎t5.mat‎ +2 -2
NeonMa‎t6.mat‎ +129 -0
NeonMat6‎.mat.meta‎ +8 -0
NeonMatEx‎ample.mat‎ +2 -2
Ta‎il‎
TrailMa‎t 0.mat‎ +2 -2
TrailMa‎t 1.mat‎ +2 -2
TrailM‎at2.mat‎ +2 -2
TrailM‎at3.mat‎ +2 -2
TrailM‎at4.mat‎ +2 -2
TrailM‎at5.mat‎ +2 -2
TrailM‎at6.mat‎ +66 -0
TrailMat6‎.mat.meta‎ +8 -0
TrailMat‎Exmpl.mat‎ +2 -2
Reso‎urces‎
guide_g‎rab.png‎ +3 -0
guide_gra‎b.png.meta‎ +178 -0
guide_tr‎igger.png‎ +3 -0
guide_trigg‎er.png.meta‎ +134 -0
Sha‎ders‎
WallFadeShade‎r.shadergraph‎ +1 -1
V‎FX‎
WinFXGr‎aph.vfx‎ +6017 -0
WinFXGrap‎h.vfx.meta‎ +7 -0
LevelC‎reator‎
Da‎ta‎
LevelsCreatio‎nHelper.asset‎ +2 -2
colors‎.asset‎ +2 -2
Mate‎rials‎
Pink‎.mat‎ +134 -0
Pink.m‎at.meta‎ +8 -0
Sce‎nes‎
EditorSc‎ene.unity‎ +200 -200
LevelLoadi‎ng/Scripts‎
LevelLo‎ader.cs‎ +10 -9
Mech‎anics‎
Play‎Scene‎
LightingD‎ata.asset‎ +3 -0
LightingDat‎a.asset.meta‎ +8 -0
Reflection‎Probe-0.exr‎ +3 -0
ReflectionPro‎be-0.exr.meta‎ +98 -0
Reflection‎Probe-1.exr‎ +3 -0
ReflectionPro‎be-1.exr.meta‎ +98 -0
Prep‎habs‎
Ghost.‎prefab‎ +4 -0
Scr‎ipts‎
Gh‎ost‎
Ghos‎t.cs‎ +18 -4
LevelEnd‎Point.cs‎ +8 -0
Mecha‎nics2D‎
JumpP‎ad.cs‎ +10 -1
PlaySce‎ne.meta‎ +8 -0
PlaySce‎ne.unity‎ +888 -419
Resource‎s/Levels‎
Dima_Sa‎ws.json‎ +1 -0
Dima_Saws‎.json.meta‎ +2 -0
Kubirill‎_1.0.json‎ +1 -0
Kubirill_1.‎0.json.meta‎ +7 -0
Kubirill‎_1.1.json‎ +1 -0
Kubirill_1.‎1.json.meta‎ +7 -0
Kubirill‎_1.2.json‎ +1 -0
Kubirill_1.‎2.json.meta‎ +7 -0
Kubirill_Gravi‎tyTutorial.json‎ +1 -0
Kubirill_GravityT‎utorial.json.meta‎ +7 -0
Kubirill_M‎oving.json‎ +1 -1
Kubirill_ca‎rPazzle.json‎ +1 -0
Kubirill_carPa‎zzle.json.meta‎ +7 -0
Kubirilltrash_cha‎oticRotation.json‎ +1 -0
Kubirilltrash_chaot‎icRotation.json.meta‎ +7 -0
YudjerickBu‎nnyHop.json‎ +1 -0
YudjerickBunn‎yHop.json.meta‎ +7 -0
YudjerickCat‎apulting.json‎ +1 -0
YudjerickCatapu‎lting.json.meta‎ +7 -0
YudjerickCata‎pulting2.json‎ +1 -0
YudjerickCatapu‎lting2.json.meta‎ +7 -0
YudjerickEl‎evator.json‎ +1 -0
YudjerickElev‎ator.json.meta‎ +7 -0
YudjerickJ‎umpWay.json‎ +1 -0
YudjerickJump‎Way.json.meta‎ +7 -0
YudjerickKeep‎Rotating.json‎ +1 -0
YudjerickKeepRo‎tating.json.meta‎ +7 -0
YudjerickTutoria‎lAxisMotion.json‎ +1 -0
YudjerickTutorialA‎xisMotion.json.meta‎ +7 -0
ShadowCast‎ing/Scripts‎
ShadowObje‎ctsUnion.cs‎ +6 -1
Project‎Settings‎
DynamicsMa‎nager.asset‎ +2 -2
ProjectSet‎tings.asset‎ +2 -2
RiderScriptEditorP‎ersistedState.asset‎ +1 -1
ShaderGraphS‎ettings.asset‎ +2 -2
TagManag‎er.asset‎ +2 -2
UserSe‎ttings‎
Lay‎outs‎
CurrentMaximi‎zeLayout.dwlt‎ +1300 -129
default-‎2021.dwlt‎ +178 -123
EditorUserSe‎ttings.asset‎ +2 -2
Search‎.index‎ +13 -0
Search.‎settings‎ +67 -1
unityProjec‎t.vrmanifest‎ +1 -1
Assets/GamePlay/Scripts/GuidManager.cs
+ 2
- 2
  • View file @ 43ad1560

  • Edit in single-file editor

  • Open in Web IDE


@@ -13,6 +13,7 @@ namespace GamePlay
[SerializeField] private GameObject guidHint;
[SerializeField] private GameObject guidCube;
[SerializeField] private float offsetX;
private bool clicked;
public event Action onGuidFinish;
@@ -30,8 +31,7 @@ namespace GamePlay
guidHint.SetActive(true);
Vector3 cubeCurrentPos = guidCube.transform.position;
yield return new WaitUntil(() => Mathf.Abs(cubeCurrentPos.x - guidCube.transform.position.x) >= offsetX);
Destroy(guidCube);
Destroy(guidHint);
Destroy(guidCube.transform.parent.gameObject);
onGuidFinish?.Invoke();
}
Assets/GamePlay/Scripts/PlayManager.cs
+ 7
- 2
  • View file @ 43ad1560

  • Edit in single-file editor

  • Open in Web IDE


@@ -3,6 +3,7 @@ using LevelCreator.Transitions;
using LevelLoading;
using UnityEngine;
using UnityEngine.SceneManagement;
using UnityEngine.VFX;
using VRUI.VRUIElements;
namespace GamePlay
@@ -66,9 +67,13 @@ namespace GamePlay
{
if (levelStartInProgress)
yield break;
if(i >= levelsToPlay.Length)
if (i >= levelsToPlay.Length)
{
GameObject.FindGameObjectWithTag("WinVFX").transform.GetChild(0).gameObject.SetActive(true);
yield break;
}
levelStartInProgress = true;
yield return new WaitForSeconds(1);
Assets/Graphics/Materials/Enviroment/EnvBottomNoiseMat 1.mat
+ 3
- 3
  • View file @ 43ad1560

  • Edit in single-file editor

  • Open in Web IDE


@@ -46,9 +46,9 @@ Material:
- _QueueControl: 0
- _QueueOffset: 0
m_Colors:
- Color_25bf9af3062043f2a822bb0672327eb3: {r: 0, g: 0.03564167, b: 1, a: 1}
- Color_83910f9db1ea4827809af4a1f657aec3: {r: 0, g: 0.03260517, b: 1, a: 0}
- Color_9bccd40c90ce4a85974e49b20c7fbf92: {r: 0, g: 0.7595396, b: 1, a: 0}
- Color_25bf9af3062043f2a822bb0672327eb3: {r: 0, g: 0.07058824, b: 2, a: 1}
- Color_83910f9db1ea4827809af4a1f657aec3: {r: 0, g: 0.0627451, b: 2, a: 0}
- Color_9bccd40c90ce4a85974e49b20c7fbf92: {r: 0, g: 1.5215687, b: 2, a: 0}
- Vector2_7d3a526fdcb34f78a39cc5f2a8466805: {r: 20, g: 20, b: 0, a: 0}
- Vector2_e337acddee1c4131bfc392e3972eb4de: {r: 0, g: 0, b: 0, a: 0}
m_BuildTextureStacks: []
Assets/Graphics/Materials/Enviroment/WallParticleMat.mat
+ 2
- 2
  • View file @ 43ad1560

  • Edit in single-file editor

  • Open in Web IDE


@@ -54,7 +54,7 @@ Material:
- _QueueControl: 0
- _QueueOffset: 0
m_Colors:
- Color_25bf9af3062043f2a822bb0672327eb3: {r: 0.0036311771, g: 0.010727155, b: 0.11320752, a: 0}
- Color_83910f9db1ea4827809af4a1f657aec3: {r: 0, g: 0.06207323, b: 1, a: 0}
- Color_25bf9af3062043f2a822bb0672327eb3: {r: 0.015686275, g: 0.047058824, b: 0.45490196, a: 0}
- Color_83910f9db1ea4827809af4a1f657aec3: {r: 0, g: 0.5026177, b: 7.999999, a: 0}
- _Speed: {r: 0.08, g: 0, b: 0, a: 0}
m_BuildTextureStacks: []
Assets/Graphics/Materials/Main/NeonMat0.mat
+ 2
- 2
  • View file @ 43ad1560

  • Edit in single-file editor

  • Open in Web IDE


@@ -107,8 +107,8 @@ Material:
- _WorkflowMode: 1
- _ZWrite: 1
m_Colors:
- Color_6a73d3a5a28c48b9a0ad1adf576fb5cf: {r: 0.7264151, g: 0.04966638, b: 0, a: 0}
- Color_94dcd4d300944a0baa9a51a93798f8c6: {r: 1, g: 0.20745395, b: 0.031372547, a: 0}
- Color_6a73d3a5a28c48b9a0ad1adf576fb5cf: {r: 1.4980392, g: 0.10980392, b: 0, a: 0}
- Color_94dcd4d300944a0baa9a51a93798f8c6: {r: 1.4980392, g: 0.3137255, b: 0.047058824, a: 0}
- _BaseColor: {r: 1, g: 1, b: 1, a: 1}
- _Color: {r: 1, g: 1, b: 1, a: 1}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
0 Assignees
None
Assign to
0 Reviewers
None
Request review from
Milestone
No milestone
None
None
Time tracking
No estimate or time spent
Labels
0
None
0
None
    Assign labels
  • Manage project labels

Lock merge request
Unlocked
2
2 participants
Дмитрий Макаров
Егор Парфенов
Reference: public-projects/Inversia!18
Source branch: BuildForDOD

Menu

Projects Groups Snippets
Help