Skip to content

Commit 3a32dfc

Browse files
add build version
1 parent a34b0d5 commit 3a32dfc

181 files changed

Lines changed: 28174 additions & 3152 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.gitignore

Lines changed: 71 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,74 @@
33
/Temp
44
/obj
55
/Library
6-
*.meta
6+
*.meta
7+
8+
9+
/[Ll]ibrary/
10+
/[Tt]emp/
11+
/[Oo]bj/
12+
/[Bb]uild/
13+
/[Bb]uilds/
14+
/[Ll]ogs/
15+
/[Uu]ser[Ss]ettings/
16+
17+
# MemoryCaptures can get excessive in size.
18+
# They also could contain extremely sensitive data
19+
/[Mm]emoryCaptures/
20+
21+
# Recordings can get excessive in size
22+
/[Rr]ecordings/
23+
24+
# Uncomment this line if you wish to ignore the asset store tools plugin
25+
# /[Aa]ssets/AssetStoreTools*
26+
27+
# Autogenerated Jetbrains Rider plugin
28+
/[Aa]ssets/Plugins/Editor/JetBrains*
29+
30+
# Visual Studio cache directory
31+
.vs/
32+
33+
# Gradle cache directory
34+
.gradle/
35+
36+
# Autogenerated VS/MD/Consulo solution and project files
37+
ExportedObj/
38+
.consulo/
39+
*.csproj
40+
*.unityproj
41+
*.sln
42+
*.suo
43+
*.tmp
44+
*.user
45+
*.userprefs
46+
*.pidb
47+
*.booproj
48+
*.svd
49+
*.pdb
50+
*.mdb
51+
*.opendb
52+
*.VC.db
53+
54+
# Unity3D generated meta files
55+
*.pidb.meta
56+
*.pdb.meta
57+
*.mdb.meta
58+
59+
# Unity3D generated file on crash reports
60+
sysinfo.txt
61+
62+
# Builds
63+
*.apk
64+
*.aab
65+
*.unitypackage
66+
*.app
67+
68+
# Crashlytics generated file
69+
crashlytics-build.properties
70+
71+
# Packed Addressables
72+
/[Aa]ssets/[Aa]ddressable[Aa]ssets[Dd]ata/*/*.bin*
73+
74+
# Temporary auto-generated Android Assets
75+
/[Aa]ssets/[Ss]treamingAssets/aa.meta
76+
/[Aa]ssets/[Ss]treamingAssets/aa/*

Assets/Actors/Eve/eve_sad_tomb.anim

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,7 @@ AnimationClip:
188188
m_Level: 0
189189
m_CycleOffset: 0
190190
m_HasAdditiveReferencePose: 0
191-
m_LoopTime: 1
191+
m_LoopTime: 0
192192
m_LoopBlend: 0
193193
m_LoopBlendOrientation: 0
194194
m_LoopBlendPositionY: 0

Assets/Scenes/Scene1.unity

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -442,7 +442,7 @@ Transform:
442442
m_GameObject: {fileID: 265475709}
443443
serializedVersion: 2
444444
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
445-
m_LocalPosition: {x: -1.97, y: -2.86, z: -1}
445+
m_LocalPosition: {x: -1, y: -2.86, z: -1}
446446
m_LocalScale: {x: 1, y: 1, z: 1}
447447
m_ConstrainProportionsScale: 0
448448
m_Children: []

Assets/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF - Fallback.asset

Lines changed: 10 additions & 222 deletions
Large diffs are not rendered by default.

Assets/Toolbox/SelectableFactory.cs

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,16 @@
11
using System;
22
using System.Collections;
33
using System.Collections.Generic;
4-
using UnityEditor.Animations;
54
using UnityEngine;
65

76
public struct CharacterInformation
87
{
98
public Sprite toolSprite;
109
public Sprite tombSprite;
11-
public AnimatorController animatorController;
10+
public RuntimeAnimatorController animatorController;
1211
public List<AudioClip> onDragClips;
1312

14-
public CharacterInformation(Sprite toolSprite, Sprite tombSprite, AnimatorController animatorController, List<AudioClip> onDragClips)
13+
public CharacterInformation(Sprite toolSprite, Sprite tombSprite, RuntimeAnimatorController animatorController, List<AudioClip> onDragClips)
1514
{
1615
this.toolSprite = toolSprite;
1716
this.tombSprite = tombSprite;
@@ -29,8 +28,8 @@ static SelectableFactory(){
2928
Sprite eveSprite = Resources.Load<Sprite>("ToolBox/toolbox_evegen");
3029
Sprite adamTombSprite = Resources.Load<Sprite>("Characters/Tomb/tomb_icon_adamgen_normal");
3130
Sprite eveTombSprite = Resources.Load<Sprite>("Characters/Tomb/tomb_icon_evegen_normal");
32-
AnimatorController adamAnimator = Resources.Load<AnimatorController>("Characters/adam");
33-
AnimatorController eveAnimator = Resources.Load<AnimatorController>("Characters/eve");
31+
RuntimeAnimatorController adamAnimator = Resources.Load<RuntimeAnimatorController>("Characters/adam");
32+
RuntimeAnimatorController eveAnimator = Resources.Load<RuntimeAnimatorController>("Characters/eve");
3433
AudioClip maleDrag1 = Resources.Load<AudioClip>("ToolBox/sounds/pick_toolbox_actor_male_generic_01");
3534
AudioClip maleDrag2 = Resources.Load<AudioClip>("ToolBox/sounds/pick_toolbox_actor_male_generic_02");
3635

Assets/Toolbox/Selection.cs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
1-
using System.Collections;
2-
using System.Collections.Generic;
3-
using UnityEditor.Animations;
41
using UnityEngine;
52

63
public class Selection : MonoBehaviour

Library/ArtifactDB

0 Bytes
Binary file not shown.
-4.17 KB
Binary file not shown.
-5.22 KB
Binary file not shown.
-5.22 KB
Binary file not shown.

0 commit comments

Comments
 (0)