Conjure/gather-and-defend
9
0
Fork 0
Code Issues Pull Requests 1 Projects Wiki Activity

Pull request #32: Art/maquetteAccurateGameScene

Browse Source 
Merge in CGD/gather-and-defend from art/maquetteAccurateGameScene to main

* commit '1ceb1da60dee39c58ddb72fe4f591f2598b7fbff':
  Archer anim; Farmer anim; Fix HUD issues
  restored testGame scene
  Made game scene look like maquette
This commit is contained in:
William Gingras 01 2023-07-17 22:00:55 +00:00
commit f733a84ebf
40 changed files with 17064 additions and 3184 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Assets/Animations/Sticks.meta Normal file
View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: c3e6b4135f27917448b49f2d73c3afd9
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

8
Assets/Animations/Sticks/Archer.meta Normal file
View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: a2eb7b2c23949244d931ec90f6eb59aa
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

15
Assets/Animations/Sticks/Archer/animator_archer.overrideController Normal file
View File

@ -0,0 +1,15 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!221 &22100000
AnimatorOverrideController:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: animator_archer
m_Controller: {fileID: 9100000, guid: 3cb91de3f312e514a92c799adf35e898, type: 2}
m_Clips:
- m_OriginalClip: {fileID: 7400000, guid: ff0a07b8a8691ba4390094d6fb771bef, type: 2}
m_OverrideClip: {fileID: 7400000, guid: 984e1da4c89830740892b4167600dd5e, type: 2}
- m_OriginalClip: {fileID: 7400000, guid: 346b13552d55b9f4a989013f6aa4d869, type: 2}
m_OverrideClip: {fileID: 7400000, guid: 94b33c17195bc6b46a9ad06108918dd8, type: 2}

8
Assets/Animations/Sticks/Archer/animator_archer.overrideController.meta Normal file
View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: d9e06870bb901e44793ef68d6a04edc9
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 22100000
userData:
assetBundleName:
assetBundleVariant:

4741
Assets/Animations/Sticks/Archer/archer_attack.anim Normal file
View File

File diff suppressed because it is too large Load Diff

8
Assets/Animations/Sticks/Archer/archer_attack.anim.meta Normal file
View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 984e1da4c89830740892b4167600dd5e
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 0
userData:
assetBundleName:
assetBundleVariant:

3797
Assets/Animations/Sticks/Archer/archer_attack_wip.anim Normal file
View File

File diff suppressed because it is too large Load Diff

8
Assets/Animations/Sticks/Archer/archer_attack_wip.anim.meta Normal file
View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 9e6d044066245d8439e5ae7a432a0656
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 7400000
userData:
assetBundleName:
assetBundleVariant:

3626
Assets/Animations/Sticks/Archer/archer_idle.anim Normal file
View File

File diff suppressed because it is too large Load Diff

8
Assets/Animations/Sticks/Archer/archer_idle.anim.meta Normal file
View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 94b33c17195bc6b46a9ad06108918dd8
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 7400000
userData:
assetBundleName:
assetBundleVariant:

0
Assets/Animations/BaseStick.meta → Assets/Animations/Sticks/BaseStick.meta
View File

4
Assets/Animations/BaseStick/animator_baseStick.controller → Assets/Animations/Sticks/BaseStick/animator_baseStick.controller
View File

@ -61,10 +61,10 @@ AnimatorStateMachine:
m_ChildStates:
- serializedVersion: 1
m_State: {fileID: 4151081420978197387}
m_Position: {x: 360, y: 80, z: 0}
m_Position: {x: 300, y: 110, z: 0}
- serializedVersion: 1
m_State: {fileID: 6697012865370906260}
m_Position: {x: 380, y: -50, z: 0}
m_Position: {x: 300, y: 40, z: 0}
m_ChildStateMachines: []
m_AnyStateTransitions: []
m_EntryTransitions: []

0
Assets/Animations/BaseStick/animator_baseStick.controller.meta → Assets/Animations/Sticks/BaseStick/animator_baseStick.controller.meta
View File

0
Assets/Animations/BaseStick/baseStick_attack.anim → Assets/Animations/Sticks/BaseStick/baseStick_attack.anim
View File

0
Assets/Animations/BaseStick/baseStick_attack.anim.meta → Assets/Animations/Sticks/BaseStick/baseStick_attack.anim.meta
View File

178
Assets/Animations/BaseStick/baseStick_idle.anim → Assets/Animations/Sticks/BaseStick/baseStick_idle.anim
View File

@ -27,7 +27,7 @@ AnimationClip:
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
- serializedVersion: 3
time: 0.5
time: 1
value: {x: 0, y: 0, z: 0}
inSlope: {x: 0, y: 0, z: 0}
outSlope: {x: 0, y: 0, z: 0}
@ -36,7 +36,7 @@ AnimationClip:
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
- serializedVersion: 3
time: 1
time: 2
value: {x: 0, y: 0, z: 0}
inSlope: {x: 0, y: 0, z: 0}
outSlope: {x: 0, y: 0, z: 0}
@ -61,7 +61,7 @@ AnimationClip:
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
- serializedVersion: 3
time: 0.5
time: 1
value: {x: 0, y: 0, z: 0}
inSlope: {x: 0, y: 0, z: 0}
outSlope: {x: 0, y: 0, z: 0}
@ -70,7 +70,7 @@ AnimationClip:
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
- serializedVersion: 3
time: 1
time: 2
value: {x: 0, y: 0, z: 0}
inSlope: {x: 0, y: 0, z: 0}
outSlope: {x: 0, y: 0, z: 0}
@ -95,7 +95,7 @@ AnimationClip:
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
- serializedVersion: 3
time: 0.5
time: 1
value: {x: 0, y: 0, z: -4.259}
inSlope: {x: 0, y: 0, z: 0}
outSlope: {x: 0, y: 0, z: 0}
@ -104,7 +104,7 @@ AnimationClip:
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
- serializedVersion: 3
time: 1
time: 2
value: {x: 0, y: 0, z: 0}
inSlope: {x: 0, y: 0, z: 0}
outSlope: {x: 0, y: 0, z: 0}
@ -129,7 +129,7 @@ AnimationClip:
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
- serializedVersion: 3
time: 0.5
time: 1
value: {x: 0, y: 0, z: 4.259}
inSlope: {x: 0, y: 0, z: 0}
outSlope: {x: 0, y: 0, z: 0}
@ -138,7 +138,7 @@ AnimationClip:
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
- serializedVersion: 3
time: 1
time: 2
value: {x: 0, y: 0, z: 0}
inSlope: {x: 0, y: 0, z: 0}
outSlope: {x: 0, y: 0, z: 0}
@ -164,8 +164,8 @@ AnimationClip:
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
- serializedVersion: 3
time: 0.5
value: {x: 0.006, y: -0.487, z: 0}
time: 1
value: {x: 0.006, y: -0.472, z: 0}
inSlope: {x: 0, y: 0, z: 0}
outSlope: {x: 0, y: 0, z: 0}
tangentMode: 0
@ -173,7 +173,7 @@ AnimationClip:
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
- serializedVersion: 3
time: 1
time: 2
value: {x: 0.006, y: -0.464, z: 0}
inSlope: {x: 0, y: 0, z: 0}
outSlope: {x: 0, y: 0, z: 0}
@ -198,7 +198,7 @@ AnimationClip:
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
- serializedVersion: 3
time: 0.5
time: 1
value: {x: -0.005, y: 0.34, z: 0}
inSlope: {x: 0, y: 0, z: 0}
outSlope: {x: 0, y: 0, z: 0}
@ -207,7 +207,7 @@ AnimationClip:
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
- serializedVersion: 3
time: 1
time: 2
value: {x: -0.005, y: 0.322, z: 0}
inSlope: {x: 0, y: 0, z: 0}
outSlope: {x: 0, y: 0, z: 0}
@ -232,7 +232,7 @@ AnimationClip:
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
- serializedVersion: 3
time: 0.5
time: 1
value: {x: -0.0050001144, y: 0.34, z: 0}
inSlope: {x: 0, y: 0, z: 0}
outSlope: {x: 0, y: 0, z: 0}
@ -241,7 +241,7 @@ AnimationClip:
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
- serializedVersion: 3
time: 1
time: 2
value: {x: -0.005000114, y: 0.322, z: 0}
inSlope: {x: 0, y: 0, z: 0}
outSlope: {x: 0, y: 0, z: 0}
@ -318,7 +318,7 @@ AnimationClip:
m_AdditiveReferencePoseClip: {fileID: 0}
m_AdditiveReferencePoseTime: 0
m_StartTime: 0
m_StopTime: 1
m_StopTime: 2
m_OrientationOffsetY: 0
m_Level: 0
m_CycleOffset: 0
@ -347,7 +347,7 @@ AnimationClip:
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.5
time: 1
value: 0
inSlope: 0
outSlope: 0
@ -356,7 +356,7 @@ AnimationClip:
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 1
time: 2
value: 0
inSlope: 0
outSlope: 0
@ -384,7 +384,7 @@ AnimationClip:
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.5
time: 1
value: 0
inSlope: 0
outSlope: 0
@ -393,7 +393,7 @@ AnimationClip:
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 1
time: 2
value: 0
inSlope: 0
outSlope: 0
@ -421,7 +421,7 @@ AnimationClip:
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.5
time: 1
value: 0
inSlope: 0
outSlope: 0
@ -430,7 +430,7 @@ AnimationClip:
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 1
time: 2
value: 0
inSlope: 0
outSlope: 0
@ -458,7 +458,7 @@ AnimationClip:
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.5
time: 1
value: 0
inSlope: 0
outSlope: 0
@ -467,7 +467,7 @@ AnimationClip:
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 1
time: 2
value: 0
inSlope: 0
outSlope: 0
@ -495,7 +495,7 @@ AnimationClip:
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.5
time: 1
value: 0
inSlope: 0
outSlope: 0
@ -504,7 +504,7 @@ AnimationClip:
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 1
time: 2
value: 0
inSlope: 0
outSlope: 0
@ -532,7 +532,7 @@ AnimationClip:
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.5
time: 1
value: 0
inSlope: 0
outSlope: 0
@ -541,7 +541,7 @@ AnimationClip:
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 1
time: 2
value: 0
inSlope: 0
outSlope: 0
@ -569,7 +569,7 @@ AnimationClip:
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.5
time: 1
value: 0
inSlope: 0
outSlope: 0
@ -578,7 +578,7 @@ AnimationClip:
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 1
time: 2
value: 0
inSlope: 0
outSlope: 0
@ -606,7 +606,7 @@ AnimationClip:
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.5
time: 1
value: 0
inSlope: 0
outSlope: 0
@ -615,7 +615,7 @@ AnimationClip:
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 1
time: 2
value: 0
inSlope: 0
outSlope: 0
@ -643,7 +643,7 @@ AnimationClip:
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.5
time: 1
value: -4.259
inSlope: 0
outSlope: 0
@ -652,7 +652,7 @@ AnimationClip:
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 1
time: 2
value: 0
inSlope: 0
outSlope: 0
@ -680,7 +680,7 @@ AnimationClip:
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.5
time: 1
value: 0
inSlope: 0
outSlope: 0
@ -689,7 +689,7 @@ AnimationClip:
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 1
time: 2
value: 0
inSlope: 0
outSlope: 0
@ -717,7 +717,7 @@ AnimationClip:
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.5
time: 1
value: 0
inSlope: 0
outSlope: 0
@ -726,7 +726,7 @@ AnimationClip:
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 1
time: 2
value: 0
inSlope: 0
outSlope: 0
@ -754,7 +754,7 @@ AnimationClip:
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.5
time: 1
value: 4.259
inSlope: 0
outSlope: 0
@ -763,7 +763,7 @@ AnimationClip:
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 1
time: 2
value: 0
inSlope: 0
outSlope: 0
@ -791,7 +791,7 @@ AnimationClip:
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.5
time: 1
value: 0.006
inSlope: 0
outSlope: 0
@ -800,7 +800,7 @@ AnimationClip:
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 1
time: 2
value: 0.006
inSlope: 0
outSlope: 0
@ -828,8 +828,8 @@ AnimationClip:
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.5
value: -0.487
time: 1
value: -0.472
inSlope: 0
outSlope: 0
tangentMode: 136
@ -837,7 +837,7 @@ AnimationClip:
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 1
time: 2
value: -0.464
inSlope: 0
outSlope: 0
@ -865,7 +865,7 @@ AnimationClip:
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.5
time: 1
value: 0
inSlope: 0
outSlope: 0
@ -874,7 +874,7 @@ AnimationClip:
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 1
time: 2
value: 0
inSlope: 0
outSlope: 0
@ -902,7 +902,7 @@ AnimationClip:
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.5
time: 1
value: -0.005
inSlope: 0
outSlope: 0
@ -911,7 +911,7 @@ AnimationClip:
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 1
time: 2
value: -0.005
inSlope: 0
outSlope: 0
@ -939,7 +939,7 @@ AnimationClip:
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.5
time: 1
value: 0.34
inSlope: 0
outSlope: 0
@ -948,7 +948,7 @@ AnimationClip:
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 1
time: 2
value: 0.322
inSlope: 0
outSlope: 0
@ -976,7 +976,7 @@ AnimationClip:
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.5
time: 1
value: 0
inSlope: 0
outSlope: 0
@ -985,7 +985,7 @@ AnimationClip:
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 1
time: 2
value: 0
inSlope: 0
outSlope: 0
@ -1013,7 +1013,7 @@ AnimationClip:
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.5
time: 1
value: -0.0050001144
inSlope: 0
outSlope: 0
@ -1022,7 +1022,7 @@ AnimationClip:
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 1
time: 2
value: -0.005000114
inSlope: 0
outSlope: 0
@ -1050,7 +1050,7 @@ AnimationClip:
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.5
time: 1
value: 0.34
inSlope: 0
outSlope: 0
@ -1059,7 +1059,7 @@ AnimationClip:
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 1
time: 2
value: 0.322
inSlope: 0
outSlope: 0
@ -1087,7 +1087,7 @@ AnimationClip:
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.5
time: 1
value: 0
inSlope: 0
outSlope: 0
@ -1096,7 +1096,7 @@ AnimationClip:
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 1
time: 2
value: 0
inSlope: 0
outSlope: 0
@ -1112,6 +1112,36 @@ AnimationClip:
classID: 4
script: {fileID: 0}
m_EulerEditorCurves:
- curve:
serializedVersion: 2
m_Curve: []
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalEulerAngles.z
path: p_arm2
classID: 4
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve: []
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalEulerAngles.y
path: p_arm2
classID: 4
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve: []
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalEulerAngles.x
path: p_arm2
classID: 4
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve: []
@ -1172,36 +1202,6 @@ AnimationClip:
path: p_arm
classID: 4
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve: []
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalEulerAngles.z
path: p_arm2
classID: 4
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve: []
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalEulerAngles.y
path: p_arm2
classID: 4
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve: []
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalEulerAngles.x
path: p_arm2
classID: 4
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve: []

0
Assets/Animations/BaseStick/baseStick_idle.anim.meta → Assets/Animations/Sticks/BaseStick/baseStick_idle.anim.meta
View File

8
Assets/Animations/Sticks/Farmer.meta Normal file
View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: ecf592755d627374eb12cdbc1ed0d770
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

72
Assets/Animations/Sticks/Farmer/animator_farmer.controller Normal file
View File

@ -0,0 +1,72 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1107 &-5495231120041285416
AnimatorStateMachine:
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Base Layer
m_ChildStates:
- serializedVersion: 1
m_State: {fileID: 7501025520752815777}
m_Position: {x: 280, y: 110, z: 0}
m_ChildStateMachines: []
m_AnyStateTransitions: []
m_EntryTransitions: []
m_StateMachineTransitions: {}
m_StateMachineBehaviours: []
m_AnyStatePosition: {x: 50, y: 20, z: 0}
m_EntryPosition: {x: 50, y: 120, z: 0}
m_ExitPosition: {x: 800, y: 120, z: 0}
m_ParentStateMachinePosition: {x: 800, y: 20, z: 0}
m_DefaultState: {fileID: 7501025520752815777}
--- !u!91 &9100000
AnimatorController:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: animator_farmer
serializedVersion: 5
m_AnimatorParameters: []
m_AnimatorLayers:
- serializedVersion: 5
m_Name: Base Layer
m_StateMachine: {fileID: -5495231120041285416}
m_Mask: {fileID: 0}
m_Motions: []
m_Behaviours: []
m_BlendingMode: 0
m_SyncedLayerIndex: -1
m_DefaultWeight: 0
m_IKPass: 0
m_SyncedLayerAffectsTiming: 0
m_Controller: {fileID: 9100000}
--- !u!1102 &7501025520752815777
AnimatorState:
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: farm
m_Speed: 1
m_CycleOffset: 0
m_Transitions: []
m_StateMachineBehaviours: []
m_Position: {x: 50, y: 50, z: 0}
m_IKOnFeet: 0
m_WriteDefaultValues: 1
m_Mirror: 0
m_SpeedParameterActive: 0
m_MirrorParameterActive: 0
m_CycleOffsetParameterActive: 0
m_TimeParameterActive: 0
m_Motion: {fileID: 7400000, guid: 7d6d1021192433a4f9d368b3447e6f8e, type: 2}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:

8
Assets/Animations/Sticks/Farmer/animator_farmer.controller.meta Normal file
View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 390f4e1966fe38b4eb835832efa9bf86
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 9100000
userData:
assetBundleName:
assetBundleVariant:

1921
Assets/Animations/Sticks/Farmer/farmerStick_farming.anim Normal file
View File

File diff suppressed because it is too large Load Diff

8
Assets/Animations/Sticks/Farmer/farmerStick_farming.anim.meta Normal file
View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 7d6d1021192433a4f9d368b3447e6f8e
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 0
userData:
assetBundleName:
assetBundleVariant:

BIN
Assets/Art/Sprites/decorations/tile_tree1.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 5.2 KiB

123
Assets/Art/Sprites/decorations/tile_tree1.png.meta Normal file
View File

@ -0,0 +1,123 @@
fileFormatVersion: 2
guid: 43582b3c6b60fd144bc56d8ab3b14349
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 12
mipmaps:
mipMapMode: 0
enableMipMap: 0
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
borderMipMap: 0
mipMapsPreserveCoverage: 0
alphaTestReferenceValue: 0.5
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
convertToNormalMap: 0
externalNormalMap: 0
heightScale: 0.25
normalMapFilter: 0
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
vTOnly: 0
ignoreMasterTextureLimit: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: 1
aniso: 1
mipBias: 0
wrapU: 1
wrapV: 1
wrapW: 1
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 1
spriteTessellationDetail: -1
textureType: 8
textureShape: 1
singleChannelComponent: 0
flipbookRows: 1
flipbookColumns: 1
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
ignorePngGamma: 0
applyGammaDecoding: 0
cookieLightType: 0
platformSettings:
- serializedVersion: 3
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Standalone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Server
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID: 5e97eb03825dee720800000000000000
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
nameFileIdTable: {}
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:

36
Assets/Art/Sprites/tiles/tile_mountain.asset Normal file
View File

@ -0,0 +1,36 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 13312, guid: 0000000000000000e000000000000000, type: 0}
m_Name: tile_mountain
m_EditorClassIdentifier:
m_Sprite: {fileID: 21300000, guid: 5cf7447a03096c04ead18f1855f01cd7, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_Transform:
e00: 1
e01: 0
e02: 0
e03: 0
e10: 0
e11: 1
e12: 0
e13: 0
e20: 0
e21: 0
e22: 1
e23: 0
e30: 0
e31: 0
e32: 0
e33: 1
m_InstancedGameObject: {fileID: 0}
m_Flags: 1
m_ColliderType: 1

8
Assets/Art/Sprites/tiles/tile_mountain.asset.meta Normal file
View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 5f47d74ebc4a8fe439ac6a4fe9ec436f
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 11400000
userData:
assetBundleName:
assetBundleVariant:

BIN
Assets/Art/Sprites/tiles/tile_mountain.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 7.4 KiB

123
Assets/Art/Sprites/tiles/tile_mountain.png.meta Normal file
View File

@ -0,0 +1,123 @@
fileFormatVersion: 2
guid: 5cf7447a03096c04ead18f1855f01cd7
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 12
mipmaps:
mipMapMode: 0
enableMipMap: 0
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
borderMipMap: 0
mipMapsPreserveCoverage: 0
alphaTestReferenceValue: 0.5
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
convertToNormalMap: 0
externalNormalMap: 0
heightScale: 0.25
normalMapFilter: 0
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
vTOnly: 0
ignoreMasterTextureLimit: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: 1
aniso: 1
mipBias: 0
wrapU: 1
wrapV: 1
wrapW: 1
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 1
spriteTessellationDetail: -1
textureType: 8
textureShape: 1
singleChannelComponent: 0
flipbookRows: 1
flipbookColumns: 1
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
ignorePngGamma: 0
applyGammaDecoding: 0
cookieLightType: 0
platformSettings:
- serializedVersion: 3
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Standalone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Server
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID: 5e97eb03825dee720800000000000000
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
nameFileIdTable: {}
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:

3
Assets/Prefabs/Monsters/ClawClawRough_monster.prefab
View File

@ -135,7 +135,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
_hp: 50
_speed: 0.15
_speed: 0.1
_attack_damage: 2
_attack_speed: 3
--- !u!1 &381864779947488822
@ -576,6 +576,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
_entity: {fileID: 313037212318601125}
_projectile: {fileID: 0}
--- !u!1 &1776168629768863343
GameObject:
m_ObjectHideFlags: 0

14
Assets/Prefabs/UI/BuyableUnitsView/BuyableUnitsView.prefab
View File

@ -58,7 +58,7 @@ MonoBehaviour:
m_Top: 0
m_Bottom: 0
m_ChildAlignment: 0
m_Spacing: 1.1
m_Spacing: 98.45
m_ChildForceExpandWidth: 1
m_ChildForceExpandHeight: 1
m_ChildControlWidth: 0
@ -103,11 +103,11 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 4052934186652138536, guid: 8560e1f66d452b543a705c8a0f3e22fa, type: 3}
propertyPath: m_SizeDelta.x
value: 100
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4052934186652138536, guid: 8560e1f66d452b543a705c8a0f3e22fa, type: 3}
propertyPath: m_SizeDelta.y
value: 100
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4052934186652138536, guid: 8560e1f66d452b543a705c8a0f3e22fa, type: 3}
propertyPath: m_LocalPosition.x
@ -205,11 +205,11 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 4052934186652138536, guid: 8560e1f66d452b543a705c8a0f3e22fa, type: 3}
propertyPath: m_SizeDelta.x
value: 100
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4052934186652138536, guid: 8560e1f66d452b543a705c8a0f3e22fa, type: 3}
propertyPath: m_SizeDelta.y
value: 100
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4052934186652138536, guid: 8560e1f66d452b543a705c8a0f3e22fa, type: 3}
propertyPath: m_LocalPosition.x
@ -307,11 +307,11 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 4052934186652138536, guid: 8560e1f66d452b543a705c8a0f3e22fa, type: 3}
propertyPath: m_SizeDelta.x
value: 100
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4052934186652138536, guid: 8560e1f66d452b543a705c8a0f3e22fa, type: 3}
propertyPath: m_SizeDelta.y
value: 100
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4052934186652138536, guid: 8560e1f66d452b543a705c8a0f3e22fa, type: 3}
propertyPath: m_LocalPosition.x

355
Assets/Prefabs/UI/BuyableUnitsView/GameObjectPlacementButton.prefab
View File

@ -33,10 +33,10 @@ RectTransform:
m_Father: {fileID: 7112938880036038065}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 12, y: 12}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 10, y: -10}
m_SizeDelta: {x: 20, y: 20}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6291074865804911655
CanvasRenderer:
@ -86,10 +86,9 @@ GameObject:
m_Component:
- component: {fileID: 907652127959947829}
- component: {fileID: 907652127959947831}
- component: {fileID: 907652127959947828}
- component: {fileID: 8289491366901995966}
- component: {fileID: 907652127959947830}
- component: {fileID: 8434244523906479734}
- component: {fileID: 7889442297748983683}
- component: {fileID: 6913755812382793111}
m_Layer: 5
m_Name: GameObjectPlacementButton
@ -110,6 +109,7 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 578448310312278818}
- {fileID: 907652128235033330}
- {fileID: 7424225105167539335}
m_Father: {fileID: 0}
@ -128,7 +128,7 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 907652127959947826}
m_CullTransparentMesh: 1
--- !u!114 &907652127959947828
--- !u!114 &8289491366901995966
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
@ -137,27 +137,11 @@ MonoBehaviour:
m_GameObject: {fileID: 907652127959947826}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: 9f4d671953709dc49a0d8a83a62dabcd, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
m_FillAmount: 1
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
m_HorizontalFit: 1
m_VerticalFit: 1
--- !u!114 &907652127959947830
MonoBehaviour:
m_ObjectHideFlags: 0
@ -198,7 +182,7 @@ MonoBehaviour:
m_SelectedTrigger: Selected
m_DisabledTrigger: Disabled
m_Interactable: 1
m_TargetGraphic: {fileID: 907652127959947828}
m_TargetGraphic: {fileID: 1078481983243672785}
m_OnClick:
m_PersistentCalls:
m_Calls: []
@ -223,32 +207,6 @@ MonoBehaviour:
_woodLabel: {fileID: 2551561112895533431}
_rockLabel: {fileID: 3195941792010457804}
_prefab: {fileID: 0}
--- !u!114 &7889442297748983683
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 907652127959947826}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 30649d3a9faa99c48a7b1166b86bf2a0, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Padding:
m_Left: 0
m_Right: 0
m_Top: 0
m_Bottom: 0
m_ChildAlignment: 4
m_Spacing: 0
m_ChildForceExpandWidth: 0
m_ChildForceExpandHeight: 0
m_ChildControlWidth: 0
m_ChildControlHeight: 0
m_ChildScaleWidth: 0
m_ChildScaleHeight: 0
m_ReverseArrangement: 0
--- !u!225 &6913755812382793111
CanvasGroup:
m_ObjectHideFlags: 0
@ -257,7 +215,7 @@ CanvasGroup:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 907652127959947826}
m_Enabled: 1
m_Alpha: 0.5
m_Alpha: 1
m_Interactable: 1
m_BlocksRaycasts: 1
m_IgnoreParentGroups: 0
@ -274,7 +232,7 @@ GameObject:
- component: {fileID: 907652128235033332}
- component: {fileID: 3793802089456309886}
m_Layer: 5
m_Name: img_card
m_Name: img_card_art
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
@ -293,12 +251,12 @@ RectTransform:
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 907652127959947829}
m_RootOrder: 0
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 45, y: 45}
m_SizeDelta: {x: 140, y: 90}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &907652128235033335
CanvasRenderer:
@ -328,7 +286,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: f4afd3d634ba224408683727d4ff8232, type: 3}
m_Sprite: {fileID: 21300000, guid: cc83829c8925f1649879f8fbb02b1d8b, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
@ -347,8 +305,8 @@ CanvasGroup:
m_GameObject: {fileID: 907652128235033331}
m_Enabled: 1
m_Alpha: 1
m_Interactable: 0
m_BlocksRaycasts: 0
m_Interactable: 1
m_BlocksRaycasts: 1
m_IgnoreParentGroups: 0
--- !u!1 &907652129260736053
GameObject:
@ -384,10 +342,10 @@ RectTransform:
m_Father: {fileID: 7112938880036038065}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 24, y: 12}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 42.8755, y: -9.399994}
m_SizeDelta: {x: 45.7511, y: 12}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &907652129260736054
CanvasRenderer:
@ -444,14 +402,14 @@ MonoBehaviour:
m_faceColor:
serializedVersion: 2
rgba: 4294967295
m_fontSize: 10.7
m_fontSize: 20.17
m_fontSizeBase: 36
m_fontWeight: 400
m_enableAutoSizing: 1
m_fontSizeMin: 0
m_fontSizeMin: 20.17
m_fontSizeMax: 72
m_fontStyle: 0
m_HorizontalAlignment: 2
m_HorizontalAlignment: 1
m_VerticalAlignment: 512
m_textAlignment: 65535
m_characterSpacing: 0
@ -507,7 +465,6 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 5139721979244350189}
- component: {fileID: 4100105604388853805}
- component: {fileID: 3554999546265944515}
m_Layer: 5
m_Name: Rock
@ -533,37 +490,11 @@ RectTransform:
m_Father: {fileID: 7424225105167539335}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 23, y: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 5, y: -47.711605}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &4100105604388853805
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1572198111939474790}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 30649d3a9faa99c48a7b1166b86bf2a0, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Padding:
m_Left: 0
m_Right: 0
m_Top: 0
m_Bottom: 0
m_ChildAlignment: 0
m_Spacing: 0
m_ChildForceExpandWidth: 0
m_ChildForceExpandHeight: 0
m_ChildControlWidth: 0
m_ChildControlHeight: 0
m_ChildScaleWidth: 0
m_ChildScaleHeight: 0
m_ReverseArrangement: 0
--- !u!114 &3554999546265944515
MonoBehaviour:
m_ObjectHideFlags: 0
@ -587,7 +518,6 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 7112938880036038065}
- component: {fileID: 4741796700644535934}
- component: {fileID: 7924787406905835589}
m_Layer: 5
m_Name: Food
@ -615,35 +545,9 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 23, y: 0}
m_AnchoredPosition: {x: 5, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &4741796700644535934
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2445409839794097317}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 30649d3a9faa99c48a7b1166b86bf2a0, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Padding:
m_Left: 0
m_Right: 0
m_Top: 0
m_Bottom: 0
m_ChildAlignment: 0
m_Spacing: 0
m_ChildForceExpandWidth: 0
m_ChildForceExpandHeight: 0
m_ChildControlWidth: 0
m_ChildControlHeight: 0
m_ChildScaleWidth: 0
m_ChildScaleHeight: 0
m_ReverseArrangement: 0
--- !u!114 &7924787406905835589
MonoBehaviour:
m_ObjectHideFlags: 0
@ -692,10 +596,10 @@ RectTransform:
m_Father: {fileID: 7106892478383455582}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 24, y: 12}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 42.8755, y: -9.4}
m_SizeDelta: {x: 45.7511, y: 12}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8779984673163102974
CanvasRenderer:
@ -752,14 +656,14 @@ MonoBehaviour:
m_faceColor:
serializedVersion: 2
rgba: 4294967295
m_fontSize: 10.7
m_fontSize: 20.17
m_fontSizeBase: 36
m_fontWeight: 400
m_enableAutoSizing: 1
m_fontSizeMin: 0
m_fontSizeMin: 20.17
m_fontSizeMax: 72
m_fontStyle: 0
m_HorizontalAlignment: 2
m_HorizontalAlignment: 1
m_VerticalAlignment: 512
m_textAlignment: 65535
m_characterSpacing: 0
@ -839,10 +743,10 @@ RectTransform:
m_Father: {fileID: 5139721979244350189}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 12, y: 12}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 10, y: -10}
m_SizeDelta: {x: 20, y: 20}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6975577339164885956
CanvasRenderer:
@ -915,10 +819,10 @@ RectTransform:
m_Father: {fileID: 7106892478383455582}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 12, y: 12}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 10, y: -10}
m_SizeDelta: {x: 20, y: 20}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &651097448331064931
CanvasRenderer:
@ -968,6 +872,7 @@ GameObject:
m_Component:
- component: {fileID: 7424225105167539335}
- component: {fileID: 6181393584221671793}
- component: {fileID: 2240110943627999575}
m_Layer: 5
m_Name: Labels
m_TagString: Untagged
@ -991,12 +896,12 @@ RectTransform:
- {fileID: 7106892478383455582}
- {fileID: 5139721979244350189}
m_Father: {fileID: 907652127959947829}
m_RootOrder: 1
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 45, y: 45}
m_AnchorMin: {x: 1, y: 1}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 53.6, y: 27.6}
m_SizeDelta: {x: 41.8326, y: 52.7116}
m_Pivot: {x: 1, y: 1}
--- !u!114 &6181393584221671793
MonoBehaviour:
@ -1015,15 +920,116 @@ MonoBehaviour:
m_Right: 5
m_Top: 5
m_Bottom: 5
m_ChildAlignment: 0
m_Spacing: 0
m_ChildForceExpandWidth: 0
m_ChildForceExpandHeight: 0
m_ChildAlignment: 6
m_Spacing: 19.8
m_ChildForceExpandWidth: 1
m_ChildForceExpandHeight: 1
m_ChildControlWidth: 0
m_ChildControlHeight: 0
m_ChildScaleWidth: 0
m_ChildScaleHeight: 0
m_ReverseArrangement: 0
--- !u!225 &2240110943627999575
CanvasGroup:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5756421746364435501}
m_Enabled: 1
m_Alpha: 1
m_Interactable: 0
m_BlocksRaycasts: 0
m_IgnoreParentGroups: 0
--- !u!1 &7114462096084942491
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 578448310312278818}
- component: {fileID: 6250447183011482546}
- component: {fileID: 1078481983243672785}
- component: {fileID: 8474016352358311395}
m_Layer: 5
m_Name: img_card_back
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &578448310312278818
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7114462096084942491}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 907652127959947829}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 140, y: 90}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6250447183011482546
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7114462096084942491}
m_CullTransparentMesh: 1
--- !u!114 &1078481983243672785
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7114462096084942491}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: 54739b098b5bab2438b8750204a08543, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
m_FillAmount: 1
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
--- !u!225 &8474016352358311395
CanvasGroup:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7114462096084942491}
m_Enabled: 1
m_Alpha: 1
m_Interactable: 1
m_BlocksRaycasts: 1
m_IgnoreParentGroups: 0
--- !u!1 &8282388115006613410
GameObject:
m_ObjectHideFlags: 0
@ -1058,10 +1064,10 @@ RectTransform:
m_Father: {fileID: 5139721979244350189}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 24, y: 12}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 42.8755, y: -9.399994}
m_SizeDelta: {x: 45.7511, y: 12}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7720087843626117068
CanvasRenderer:
@ -1118,14 +1124,14 @@ MonoBehaviour:
m_faceColor:
serializedVersion: 2
rgba: 4294967295
m_fontSize: 10.7
m_fontSize: 20.17
m_fontSizeBase: 36
m_fontWeight: 400
m_enableAutoSizing: 1
m_fontSizeMin: 0
m_fontSizeMin: 20.17
m_fontSizeMax: 72
m_fontStyle: 0
m_HorizontalAlignment: 2
m_HorizontalAlignment: 1
m_VerticalAlignment: 512
m_textAlignment: 65535
m_characterSpacing: 0
@ -1181,7 +1187,6 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 7106892478383455582}
- component: {fileID: 5791630491435835906}
- component: {fileID: 3610034570124512254}
m_Layer: 5
m_Name: Wood
@ -1207,37 +1212,11 @@ RectTransform:
m_Father: {fileID: 7424225105167539335}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 23, y: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 5, y: -26.874405}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &5791630491435835906
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8995466496953049922}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 30649d3a9faa99c48a7b1166b86bf2a0, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Padding:
m_Left: 0
m_Right: 0
m_Top: 0
m_Bottom: 0
m_ChildAlignment: 0
m_Spacing: 0
m_ChildForceExpandWidth: 0
m_ChildForceExpandHeight: 0
m_ChildControlWidth: 0
m_ChildControlHeight: 0
m_ChildScaleWidth: 0
m_ChildScaleHeight: 0
m_ReverseArrangement: 0
--- !u!114 &3610034570124512254
MonoBehaviour:
m_ObjectHideFlags: 0

1167
Assets/Prefabs/UI/BuyableUnitsView/TilePlacementButton.prefab
View File

File diff suppressed because it is too large Load Diff

37
Assets/Prefabs/baseArcher.prefab
View File

@ -1,5 +1,36 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1 &3095742763919814080
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 5690496880090176109}
m_Layer: 0
m_Name: '@projectileSpawn'
m_TagString: Untagged
m_Icon: {fileID: 6519382022992737161, guid: 0000000000000000d000000000000000, type: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &5690496880090176109
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3095742763919814080}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0.242, y: -0.103, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 4939216988410496448}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &3432466021019175124
GameObject:
m_ObjectHideFlags: 0
@ -101,6 +132,7 @@ Transform:
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 4939216988434630772}
- {fileID: 5690496880090176109}
m_Father: {fileID: 6125909154266960114}
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: -32.83}
@ -533,7 +565,7 @@ Transform:
m_GameObject: {fileID: 5531237550998824024}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -6.61, y: -0.638, z: 1.8112363}
m_LocalScale: {x: 1, y: 1, z: 1}
m_LocalScale: {x: 0.8, y: 0.8, z: 0.8}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 5531237550896301018}
@ -1242,7 +1274,7 @@ Animator:
m_GameObject: {fileID: 6125909154234938794}
m_Enabled: 1
m_Avatar: {fileID: 0}
m_Controller: {fileID: 9100000, guid: 3cb91de3f312e514a92c799adf35e898, type: 2}
m_Controller: {fileID: 22100000, guid: d9e06870bb901e44793ef68d6a04edc9, type: 2}
m_CullingMode: 0
m_UpdateMode: 0
m_ApplyRootMotion: 0
@ -1267,6 +1299,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
_entity: {fileID: 9177659942431061517}
_projectile: {fileID: 6962989255644195630, guid: 869a03bba705e8d4485aa73daad773dc, type: 3}
_projectileSpawn: {fileID: 5690496880090176109}
--- !u!1 &6125909154266960117
GameObject:
m_ObjectHideFlags: 0

2
Assets/Prefabs/baseProjectile.prefab
View File

@ -109,7 +109,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
_detectionLinked: {fileID: 3172728477976940186}
_angle: 10
_speed: 2
_speed: 1
--- !u!1 &6962989256011107503
GameObject:
m_ObjectHideFlags: 0

4
Assets/Prefabs/farmerStick.prefab
View File

@ -80,7 +80,7 @@ Animator:
m_GameObject: {fileID: 5157279991943416620}
m_Enabled: 1
m_Avatar: {fileID: 0}
m_Controller: {fileID: 9100000, guid: 3cb91de3f312e514a92c799adf35e898, type: 2}
m_Controller: {fileID: 9100000, guid: 390f4e1966fe38b4eb835832efa9bf86, type: 2}
m_CullingMode: 0
m_UpdateMode: 0
m_ApplyRootMotion: 0
@ -319,7 +319,7 @@ Transform:
m_GameObject: {fileID: 5157279992115123224}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: -7.588, y: -0.7679999, z: 1.9027507}
m_LocalScale: {x: 1, y: 1, z: 1}
m_LocalScale: {x: 0.8, y: 0.8, z: 0.8}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 5157279992088867738}

3935
Assets/Scenes/Game.unity
View File

File diff suppressed because it is too large Load Diff

6
Assets/Scripts/Resource/ResourceManager.cs
View File

@ -5,9 +5,9 @@ using UnityEngine;
/// </summary>
public class ResourceManager : Singleton<ResourceManager>
{
private int _rockAmount = 20;
private int _woodAmount = 20;
private int _foodAmount = 20;
private int _rockAmount = 0;
private int _woodAmount = 30;
private int _foodAmount = 50;
private const int MAX = int.MaxValue;
private const int MIN = 0;

5
Assets/Scripts/Root.cs
View File

@ -9,6 +9,8 @@ public class Root : MonoBehaviour
private Entity _entity;
[SerializeField]
private GameObject _projectile;
[SerializeField]
private Transform _projectileSpawn;
void Attack() {
_entity.Enemy.Hit( _entity.AttackDamage);
@ -24,7 +26,8 @@ public class Root : MonoBehaviour
_rigidbodyAlly = _entity.GetComponent<Rigidbody2D>();
_rigidbodyOpponent = _entity.Enemy.GetComponent<Rigidbody2D>();
GameObject _newArrow = Instantiate(_projectile, _rigidbodyAlly.position, Quaternion.identity);
Vector3 spawnPos = (_projectileSpawn == null) ? _rigidbodyAlly.position : _projectileSpawn.position;
GameObject _newArrow = Instantiate(_projectile, spawnPos, Quaternion.identity);
//Warning : the Speed of the arrow is equal to the speed of this unit, if this unit need to move, use an other variable !
_newArrow.GetComponent<Projectile>().Damage = _entity.AttackDamage;

2
Assets/Tiles/Forest.asset
View File

@ -12,7 +12,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 84b05f2a26f63da46a1028488482d079, type: 3}
m_Name: Forest
m_EditorClassIdentifier:
_sprite: {fileID: 21300000, guid: 5c630d8b4d37f5d4f974d38f670ad5c1, type: 3}
_sprite: {fileID: 21300000, guid: 43582b3c6b60fd144bc56d8ab3b14349, type: 3}
_isCollidable: 0
_yieldPrefab: {fileID: 6962989255644195630, guid: f20569b5452c2b341a95d656b7534b7e, type: 3}
_yieldSpeed: 0.1

2
Assets/Tiles/Mountain.asset
View File

@ -12,5 +12,5 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 9ff04aa2e904a19458fd5b144c230054, type: 3}
m_Name: Mountain
m_EditorClassIdentifier:
_sprite: {fileID: 21300000, guid: 6298844400e212d40bce870425ac2a5b, type: 3}
_sprite: {fileID: 21300000, guid: 5cf7447a03096c04ead18f1855f01cd7, type: 3}
_isCollidable: 1