xiaoqi
/
SHADE_Y3
1
0
Fork 0
Code Issues 12 Pull Requests Packages Projects Releases 9 Wiki Activity

Bug fixes and new assets #246

Merged
glencelow merged 10 commits from PlayerController into main 2022-11-22 16:25:14 +08:00
Conversation 0 Commits 10 Files Changed 103 +23297 -23
38 changed files with 23297 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 219d5025f3 - Show all commits

8
Assets/Materials/HouseMaterial.shmat Normal file
View File

@ -0,0 +1,8 @@
- VertexShader: 39210065
FragmentShader: 46377769
SubPass: G-Buffer Write
Properties:
data.color: {x: 1, y: 1, z: 1, w: 1}
data.textureIndex: 61918518
data.alpha: 0
data.beta: {x: 1, y: 1, z: 1}

3
Assets/Materials/HouseMaterial.shmat.shmeta Normal file
View File

@ -0,0 +1,3 @@
Name: HouseMaterial
ID: 127069936
Type: 7

8
Assets/Materials/MT_ColorPaletteDefault.shmat Normal file
View File

@ -0,0 +1,8 @@
- VertexShader: 39210065
FragmentShader: 46377769
SubPass: G-Buffer Write
Properties:
data.color: {x: 1, y: 1, z: 1, w: 1}
data.textureIndex: 57342922
data.alpha: 0
data.beta: {x: 1, y: 1, z: 1}

3
Assets/Materials/MT_ColorPaletteDefault.shmat.shmeta Normal file
View File

@ -0,0 +1,3 @@
Name: MT_ColorPaletteDefault
ID: 131956078
Type: 7

8
Assets/Materials/MT_House_Palette4.shmat Normal file
View File

@ -0,0 +1,8 @@
- VertexShader: 39210065
FragmentShader: 46377769
SubPass: G-Buffer Write
Properties:
data.color: {x: 1, y: 1, z: 1, w: 1}
data.textureIndex: 53438927
data.alpha: 0
data.beta: {x: 1, y: 1, z: 1}

3
Assets/Materials/MT_House_Palette4.shmat.shmeta Normal file
View File

@ -0,0 +1,3 @@
Name: MT_House_Palette4
ID: 132690168
Type: 7

BIN
Assets/Materials/TX_HouseInterior_Palette3.shtex Normal file
View File

Binary file not shown.

3
Assets/Materials/TX_HouseInterior_Palette3.shtex.shmeta Normal file
View File

@ -0,0 +1,3 @@
Name: TX_HouseInterior_Palette3
ID: 61918518
Type: 3

696
Assets/Models/ExteriorMeshs.gltf Normal file
View File

File diff suppressed because one or more lines are too long

BIN
Assets/Models/ExteriorMeshs.shmodel Normal file
View File

Binary file not shown.

28
Assets/Models/ExteriorMeshs.shmodel.shmeta Normal file
View File

@ -0,0 +1,28 @@
Name: ExteriorMeshs
ID: 80559352
Type: 4
Sub Assets:
Name: TreeVar1
ID: 150881323
Type: 8
Name: TreeVar2
ID: 140386412
Type: 8
Name: TreeVar3
ID: 146337876
Type: 8
Name: BushVar1
ID: 143461339
Type: 8
Name: BushVar2
ID: 136373407
Type: 8
Name: BushVar3
ID: 144928031
Type: 8
Name: FenceSinglePiece
ID: 140263745
Type: 8
Name: FenceFivePiece
ID: 145842965
Type: 8

549
Assets/Models/KitchenAddOns1.gltf Normal file
View File

File diff suppressed because one or more lines are too long

BIN
Assets/Models/KitchenAddOns1.shmodel Normal file
View File

Binary file not shown.

22
Assets/Models/KitchenAddOns1.shmodel.shmeta Normal file
View File

@ -0,0 +1,22 @@
Name: KitchenAddOns1
ID: 79971916
Type: 4
Sub Assets:
Name: TallStool01
ID: 140539561
Type: 8
Name: Chair01
ID: 142860936
Type: 8
Name: Table01
ID: 140474147
Type: 8
Name: ServiceTray01
ID: 140279658
Type: 8
Name: RubbishBin01_Body
ID: 143026779
Type: 8
Name: RubbishBin01_Lid
ID: 142134724
Type: 8

141
Assets/Models/KitchenCounterEmpty.gltf Normal file
View File

File diff suppressed because one or more lines are too long

BIN
Assets/Models/KitchenCounterEmpty.shmodel Normal file
View File

Binary file not shown.

7
Assets/Models/KitchenCounterEmpty.shmodel.shmeta Normal file
View File

@ -0,0 +1,7 @@
Name: KitchenCounterEmpty
ID: 78136063
Type: 4
Sub Assets:
Name: CupboardEmpty
ID: 144189529
Type: 8

1393
Assets/Models/KitchenCounterMeshs.gltf Normal file
View File

File diff suppressed because one or more lines are too long

BIN
Assets/Models/KitchenCounterMeshs.shmodel Normal file
View File

Binary file not shown.

55
Assets/Models/KitchenCounterMeshs.shmodel.shmeta Normal file
View File

@ -0,0 +1,55 @@
Name: KitchenCounterMeshs
ID: 82758363
Type: 4
Sub Assets:
Name: DrawerMid01
ID: 139881558
Type: 8
Name: DrawerSmall01
ID: 135779275
Type: 8
Name: DrawerSmall02
ID: 146001396
Type: 8
Name: DrawerSmall03
ID: 150413201
Type: 8
Name: DrawerLarge01
ID: 138305769
Type: 8
Name: DoorLeft
ID: 150547241
Type: 8
Name: DoorRight
ID: 146520338
Type: 8
Name: CupboardSolid
ID: 144974966
Type: 8
Name: DoorDoubleRight
ID: 146717179
Type: 8
Name: CupboardSinkPiece
ID: 141601355
Type: 8
Name: DoorDoubleLeft
ID: 146024338
Type: 8
Name: CupboardSolidBlock
ID: 142281760
Type: 8
Name: CupboardSolidHalf
ID: 137745540
Type: 8
Name: CupboardOven
ID: 136828790
Type: 8
Name: DoorOven
ID: 150740704
Type: 8
Name: DoorOvenGlass
ID: 135623020
Type: 8
Name: OvenTray
ID: 136078992
Type: 8

546
Assets/Models/KitchenShelves1.gltf Normal file
View File

File diff suppressed because one or more lines are too long

BIN
Assets/Models/KitchenShelves1.shmodel Normal file
View File

Binary file not shown.

22
Assets/Models/KitchenShelves1.shmodel.shmeta Normal file
View File

@ -0,0 +1,22 @@
Name: KitchenShelves1
ID: 82783113
Type: 4
Sub Assets:
Name: BottomLid
ID: 138181722
Type: 8
Name: TopLid
ID: 147761585
Type: 8
Name: Backcover
ID: 139576452
Type: 8
Name: InBetweenShelf
ID: 142336524
Type: 8
Name: FrameHigh
ID: 150586966
Type: 8
Name: FrameLow
ID: 140066298
Type: 8

157
Assets/Models/MD_SkyDome01.gltf Normal file
View File

File diff suppressed because one or more lines are too long

BIN
Assets/Models/MD_SkyDome01.shmodel Normal file
View File

Binary file not shown.

7
Assets/Models/MD_SkyDome01.shmodel.shmeta Normal file
View File

@ -0,0 +1,7 @@
Name: MD_SkyDome01
ID: 82516582
Type: 4
Sub Assets:
Name: Sphere
ID: 144340823
Type: 8

10987
Assets/Scenes/Environment.shade Normal file
View File

File diff suppressed because it is too large Load Diff

3
Assets/Scenes/Environment.shade.shmeta Normal file
View File

@ -0,0 +1,3 @@
Name: Environment
ID: 91553073
Type: 5

8612
Assets/Scenes/MainGame.shade Normal file
View File

File diff suppressed because it is too large Load Diff

3
Assets/Scenes/MainGame.shade.shmeta Normal file
View File

@ -0,0 +1,3 @@
Name: MainGame
ID: 86098106
Type: 5

48
Assets/Scenes/PlayerControllerTest.shade
View File

@ -39,7 +39,6 @@
IsActive: true
RigidBody Component:
Type: Static
Mass: 1
Drag: 0.00999999978
Angular Drag: 0.00999999978
Use Gravity: true
@ -61,6 +60,7 @@
Bounciness: 0
Density: 1
Position Offset: {x: 0, y: 0, z: 0}
Rotation Offset: {x: 0, y: 0, z: 0}
IsActive: true
Scripts: ~
- EID: 2
@ -69,9 +69,9 @@
NumberOfChildren: 3
Components:
Transform Component:
Translate: {x: 0.214953125, y: -3.67369676, z: -3.03063416}
Rotate: {x: -0, y: 0, z: -0}
Scale: {x: 2, y: 2, z: 2}
Translate: {x: -0.0897406489, y: -4.07369709, z: 3.6087606}
Rotate: {x: 0, y: -0.19268477, z: 0}
Scale: {x: 1, y: 1, z: 1}
IsActive: true
Renderable Component:
Mesh: 149697411
@ -79,7 +79,6 @@
IsActive: true
RigidBody Component:
Type: Dynamic
Mass: 1
Drag: 2
Angular Drag: 0
Use Gravity: false
@ -96,11 +95,12 @@
Colliders:
- Is Trigger: false
Type: Box
Half Extents: {x: 1, y: 1, z: 1}
Half Extents: {x: 0.5, y: 0.699999988, z: 0.5}
Friction: 0.400000006
Bounciness: 0
Density: 1
Position Offset: {x: 0, y: 0.5, z: 0}
Position Offset: {x: 0, y: 0.300000012, z: 0}
Rotation Offset: {x: 0, y: 0, z: 0}
IsActive: true
Scripts:
- Type: PlayerController
@ -119,6 +119,9 @@
throwForce: [300, 300, 300]
delayTimer: 1
aimingLength: 1.5
- Type: StateMachine
currentStateName: Idle State
currentAnimName: ""
- EID: 3
Name: HoldingPoint
IsActive: true
@ -141,9 +144,9 @@
Scale: {x: 1, y: 1, z: 1}
IsActive: true
Camera Component:
Position: {x: 0.214953125, y: -3.67369676, z: -3.03063416}
Pitch: -20.6997433
Yaw: 285.002838
Position: {x: 0.330392599, y: -2.72767258, z: 5.02710676}
Pitch: -42.2981491
Yaw: 16.4989166
Roll: 0
Width: 1920
Height: 1080
@ -178,8 +181,8 @@
NumberOfChildren: 0
Components:
Transform Component:
Translate: {x: -8, y: -4.42369843, z: 2.5}
Rotate: {x: -0, y: 0, z: 0}
Translate: {x: -8, y: -4.42369699, z: 3.65323806}
Rotate: {x: -0, y: 0, z: -0}
Scale: {x: 1, y: 1, z: 1}
IsActive: true
Renderable Component:
@ -188,7 +191,6 @@
IsActive: true
RigidBody Component:
Type: Dynamic
Mass: 1
Drag: 0
Angular Drag: 0
Use Gravity: true
@ -210,6 +212,7 @@
Bounciness: 0
Density: 1
Position Offset: {x: 0, y: 0.5, z: 0}
Rotation Offset: {x: 0, y: 0, z: 0}
IsActive: true
Scripts: ~
- EID: 7
@ -253,7 +256,6 @@
IsActive: true
RigidBody Component:
Type: Static
Mass: 1
Drag: 0.00999999978
Angular Drag: 0.00999999978
Use Gravity: true
@ -289,8 +291,8 @@
NumberOfChildren: 0
Components:
Transform Component:
Translate: {x: 3.19865847, y: -3.66369891, z: -4.99997044}
Rotate: {x: -1.62010674e-05, y: 2.19047888e-06, z: 6.4769687e-05}
Translate: {x: 3.19896913, y: -3.66431332, z: -4.99997139}
Rotate: {x: -1.57956983e-05, y: 2.20007223e-06, z: -0.000548519194}
Scale: {x: 2, y: 2, z: 2}
IsActive: true
Renderable Component:
@ -299,7 +301,6 @@
IsActive: true
RigidBody Component:
Type: Dynamic
Mass: 1
Drag: 0.100000001
Angular Drag: 0.100000001
Use Gravity: true
@ -321,6 +322,7 @@
Bounciness: 0
Density: 1
Position Offset: {x: 0, y: 0.5, z: 0}
Rotation Offset: {x: 0, y: 0, z: 0}
- Is Trigger: true
Type: Box
Half Extents: {x: 2, y: 2, z: 2}
@ -328,6 +330,7 @@
Bounciness: 0
Density: 1
Position Offset: {x: 0, y: 0.5, z: 0}
Rotation Offset: {x: 0, y: 0, z: 0}
IsActive: true
Scripts:
- Type: Item
@ -339,8 +342,8 @@
NumberOfChildren: 0
Components:
Transform Component:
Translate: {x: -5.02078199, y: -1.27369666, z: -2.14885736}
Rotate: {x: -9.82871934e-05, y: 0.000654734089, z: -3.21757163e-08}
Translate: {x: -5.02078056, y: -4.17369747, z: -2.14891005}
Rotate: {x: -2.95397289e-08, y: 0.00065473502, z: -4.44611992e-08}
Scale: {x: 1.99998975, y: 2, z: 1.99998975}
IsActive: true
Renderable Component:
@ -349,7 +352,6 @@
IsActive: true
RigidBody Component:
Type: Dynamic
Mass: 1
Drag: 0.100000001
Angular Drag: 0.100000001
Use Gravity: true
@ -371,6 +373,7 @@
Bounciness: 0
Density: 1
Position Offset: {x: 0, y: 0.5, z: 0}
Rotation Offset: {x: 0, y: 0, z: 0}
- Is Trigger: true
Type: Box
Half Extents: {x: 1, y: 1, z: 1}
@ -378,6 +381,7 @@
Bounciness: 0
Density: 1
Position Offset: {x: 0, y: 0.5, z: 0}
Rotation Offset: {x: 0, y: 0, z: 0}
IsActive: true
Scripts:
- Type: Item
@ -401,7 +405,6 @@
IsActive: true
RigidBody Component:
Type: Static
Mass: 1
Drag: 0.00999999978
Angular Drag: 0.00999999978
Use Gravity: true
@ -423,6 +426,7 @@
Bounciness: 0
Density: 1
Position Offset: {x: 0, y: 0, z: 0}
Rotation Offset: {x: 0, y: 0, z: 0}
IsActive: true
Scripts:
- Type: ScoringZone
@ -438,7 +442,6 @@
IsActive: true
RigidBody Component:
Type: Static
Mass: 1
Drag: 0.00999999978
Angular Drag: 0.00999999978
Use Gravity: true
@ -460,6 +463,7 @@
Bounciness: 0
Density: 1
Position Offset: {x: 0, y: 0, z: 0}
Rotation Offset: {x: 0, y: 0, z: 0}
IsActive: true
Scripts:
- Type: ScoringZone

2
Assets/Scripts/Gameplay/Player/UT_PlayerCaughtState .cs.shmeta
View File

@ -1,3 +1,3 @@
Name: UT_PlayerCaughtState
ID: 154071709
ID: 154746070
Type: 9

BIN
Assets/TX_HouseInterior_Palette4.dds Normal file
View File

Binary file not shown.

BIN
Assets/TX_HouseInterior_Palette4.shtex Normal file
View File

Binary file not shown.

3
Assets/TX_HouseInterior_Palette4.shtex.shmeta Normal file
View File

@ -0,0 +1,3 @@
Name: TX_HouseInterior_Palette4
ID: 53438927
Type: 3

BIN
Assets/TX_StaticMesh.dds Normal file
View File

Binary file not shown.

BIN
Assets/TX_StaticMesh.shtex Normal file
View File

Binary file not shown.

3
Assets/TX_StaticMesh.shtex.shmeta Normal file
View File

@ -0,0 +1,3 @@
Name: TX_StaticMesh
ID: 57342922
Type: 3