Skip to content

Commit dbfa563

Browse files
update
With some minor issues during the initial connection, this is a port using the unified POC branches.
1 parent eb62182 commit dbfa563

File tree

66 files changed

+1027
-167
lines changed

Some content is hidden

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

66 files changed

+1027
-167
lines changed
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
version https://git-lfs.github.com/spec/v1
2-
oid sha256:5a81dd6c61c12fb973a505b7d68f14437567fa1826ad7c6cc8b7c90dde50a689
3-
size 1078
2+
oid sha256:4c9c99180d81b74980e09bb7c52025d77136acd9d7f633132c04362bd7c39cf7
3+
size 1104
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
version https://git-lfs.github.com/spec/v1
2-
oid sha256:f1602e4cff482bcacf4eaac104fe12fe5d46e71c871a94415b96ada086f44e71
3-
size 2790
2+
oid sha256:38608b2c9159dd651eee30796970139b7f6e48d084b78a2ac70cd06a13c3cf4a
3+
size 3435

Assets/InputSystem/PlayerActions.inputactions

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
{
2+
"version": 1,
23
"name": "PlayerActions",
34
"maps": [
45
{
@@ -114,18 +115,18 @@
114115
"initialStateCheck": false
115116
},
116117
{
117-
"name": "Target",
118+
"name": "Skill1",
118119
"type": "Button",
119-
"id": "43b99b7b-ca7a-4ef6-9d13-2751c2d2b3aa",
120+
"id": "b97db0db-4f74-415d-99bf-8b754bfa6827",
120121
"expectedControlType": "",
121122
"processors": "",
122123
"interactions": "",
123124
"initialStateCheck": false
124125
},
125126
{
126-
"name": "Skill1",
127+
"name": "Target",
127128
"type": "Button",
128-
"id": "b97db0db-4f74-415d-99bf-8b754bfa6827",
129+
"id": "43b99b7b-ca7a-4ef6-9d13-2751c2d2b3aa",
129130
"expectedControlType": "",
130131
"processors": "",
131132
"interactions": "",

Assets/Material/Characters/Character_Shadow.mat

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,7 @@ Material:
104104
- _DetailAlbedoMapScale: 1
105105
- _DetailNormalMapScale: 1
106106
- _DstBlend: 10
107+
- _DstBlendAlpha: 10
107108
- _EnvironmentReflections: 1
108109
- _GlossMapScale: 0
109110
- _Glossiness: 0
@@ -119,6 +120,7 @@ Material:
119120
- _SmoothnessTextureChannel: 0
120121
- _SpecularHighlights: 1
121122
- _SrcBlend: 5
123+
- _SrcBlendAlpha: 1
122124
- _Surface: 1
123125
- _UseAlpha: 1
124126
- _UseSoftParticles: 0

Assets/Material/Characters/Enemy_Eyes_sheet.mat

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,7 @@ Material:
9797
- _Depth_Blend: 0
9898
- _DetailNormalMapScale: 1
9999
- _DstBlend: 10
100+
- _DstBlendAlpha: 10
100101
- _GlossMapScale: 1
101102
- _Glossiness: 1
102103
- _GlossinessSource: 0
@@ -115,6 +116,7 @@ Material:
115116
- _SpecSource: 0
116117
- _SpecularHighlights: 1
117118
- _SrcBlend: 5
119+
- _SrcBlendAlpha: 1
118120
- _Surface: 1
119121
- _UVSec: 0
120122
- _UseAlpha: 1

Assets/Material/Characters/Enemy_Mouth_sheet.mat

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -110,6 +110,7 @@ Material:
110110
- _Depth_Blend: 0
111111
- _DetailNormalMapScale: 1
112112
- _DstBlend: 10
113+
- _DstBlendAlpha: 10
113114
- _GlossMapScale: 1
114115
- _Glossiness: 1
115116
- _GlossinessSource: 0
@@ -130,6 +131,7 @@ Material:
130131
- _SpecSource: 0
131132
- _SpecularHighlights: 1
132133
- _SrcBlend: 5
134+
- _SrcBlendAlpha: 1
133135
- _Surface: 1
134136
- _UVSec: 0
135137
- _UseAlpha: 1

Assets/Material/Characters/Hero_Eyes_sheet.mat

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,7 @@ Material:
9797
- _Depth_Blend: 0
9898
- _DetailNormalMapScale: 1
9999
- _DstBlend: 10
100+
- _DstBlendAlpha: 10
100101
- _GlossMapScale: 1
101102
- _Glossiness: 1
102103
- _GlossinessSource: 0
@@ -115,6 +116,7 @@ Material:
115116
- _SpecSource: 0
116117
- _SpecularHighlights: 1
117118
- _SrcBlend: 5
119+
- _SrcBlendAlpha: 1
118120
- _Surface: 1
119121
- _UVSec: 0
120122
- _UseAlpha: 1

Assets/Material/Characters/Hero_Mouth_sheet.mat

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,7 @@ Material:
9797
- _Depth_Blend: 0
9898
- _DetailNormalMapScale: 1
9999
- _DstBlend: 10
100+
- _DstBlendAlpha: 10
100101
- _GlossMapScale: 1
101102
- _Glossiness: 1
102103
- _GlossinessSource: 0
@@ -117,6 +118,7 @@ Material:
117118
- _SpecSource: 0
118119
- _SpecularHighlights: 1
119120
- _SrcBlend: 5
121+
- _SrcBlendAlpha: 1
120122
- _Surface: 1
121123
- _UVSec: 0
122124
- _UseAlpha: 1

Assets/Material/Dungeon/M_Lava.mat

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -116,6 +116,7 @@ Material:
116116
- _DetailAlbedoMapScale: 1
117117
- _DetailNormalMapScale: 1
118118
- _DstBlend: 0
119+
- _DstBlendAlpha: 0
119120
- _EnvironmentReflections: 1
120121
- _GlossMapScale: 1
121122
- _Glossiness: 0.5
@@ -132,6 +133,7 @@ Material:
132133
- _SmoothnessTextureChannel: 0
133134
- _SpecularHighlights: 1
134135
- _SrcBlend: 1
136+
- _SrcBlendAlpha: 1
135137
- _Surface: 0
136138
- _UVSec: 0
137139
- _UseAlpha: 0

Assets/Material/Dungeon/M_SpiderWeb.mat

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -126,6 +126,7 @@ Material:
126126
- _DistortionStrength: 1
127127
- _DistortionStrengthScaled: 0
128128
- _DstBlend: 1
129+
- _DstBlendAlpha: 1
129130
- _EmissionEnabled: 0
130131
- _EnableExternalAlpha: 0
131132
- _FlipbookMode: 0
@@ -145,6 +146,7 @@ Material:
145146
- _SoftParticlesNearFadeDistance: 0
146147
- _SpecularHighlights: 1
147148
- _SrcBlend: 5
149+
- _SrcBlendAlpha: 1
148150
- _Surface: 1
149151
- _UVSec: 0
150152
- _UseAlpha: 0

0 commit comments

Comments
 (0)