laurids
/
GWConquest
1
0
Fork 0
Code Issues 0 Pull Requests 0 Projects 0 Releases 0 Wiki Activity
Browse Source

Capturing Delay

master
laurids 2 years ago
parent
e05c3d2d77
commit
6ef99deabe
15 changed files with 817 additions and 72 deletions
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +108
    -50
      Assets/GWConquest/Animations/DistrictIcon.controller
  2. +377
    -0
      Assets/GWConquest/Animations/DistrictIconCooldown.anim
  3. +8
    -0
      Assets/GWConquest/Animations/DistrictIconCooldown.anim.meta
  4. +225
    -5
      Assets/GWConquest/Prefabs/UI/DistrictIcon.prefab
  5. +9
    -8
      Assets/GWConquest/Scenes/GalaxyMap.unity
  6. +25
    -3
      Assets/GWConquest/Scripts/District.cs
  7. +9
    -3
      Assets/GWConquest/Scripts/Formation.cs
  8. +4
    -0
      Assets/GWConquest/Scripts/GameManager.cs
  9. +1
    -1
      Assets/GWConquest/Scripts/UI/BattleUnitIcon.cs
  10. +23
    -0
      Assets/GWConquest/Scripts/UI/DistrictIcon.cs
  11. +1
    -1
      Assets/GWConquest/Scripts/UI/TransportUIElement.cs
  12. +1
    -1
      Assets/GWConquest/Scripts/Unit.cs
  13. BIN
      Assets/Photon/PhotonBolt/assemblies/bolt.user.dll
  14. BIN
      Assets/Photon/PhotonBolt/assemblies/bolt.user.dll.mdb
  15. +26
    -0
      Assets/Photon/PhotonBolt/project.json

+ 108
- 50
Assets/GWConquest/Animations/DistrictIcon.controller View File

@ -27,7 +27,7 @@ AnimatorStateTransition:
m_CanTransitionToSelf: 1
--- !u!1102 &-6771020040450316817
AnimatorState:
serializedVersion: 5
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
@ -53,7 +53,7 @@ AnimatorState:
m_TimeParameter:
--- !u!1107 &-3725002495861129689
AnimatorStateMachine:
serializedVersion: 5
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
@ -75,9 +75,6 @@ AnimatorStateMachine:
- serializedVersion: 1
m_State: {fileID: 81414940235101507}
m_Position: {x: 340, y: 260, z: 0}
- serializedVersion: 1
m_State: {fileID: -3598374503955240968}
m_Position: {x: 375, y: 325, z: 0}
m_ChildStateMachines: []
m_AnyStateTransitions:
- {fileID: 2316540140041611674}
@ -93,35 +90,9 @@ AnimatorStateMachine:
m_ExitPosition: {x: 800, y: 120, z: 0}
m_ParentStateMachinePosition: {x: 800, y: 20, z: 0}
m_DefaultState: {fileID: 7052444190363486090}
--- !u!1102 &-3598374503955240968
AnimatorState:
serializedVersion: 5
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: DistrictIconBattle
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: e20c4a46c80377b41a272dc011f29d27, type: 2}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!1102 &-2751878947128903844
AnimatorState:
serializedVersion: 5
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
@ -147,7 +118,7 @@ AnimatorState:
m_TimeParameter:
--- !u!1102 &-1834868961509435414
AnimatorState:
serializedVersion: 5
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
@ -157,6 +128,7 @@ AnimatorState:
m_CycleOffset: 0
m_Transitions:
- {fileID: 4982762045914491146}
- {fileID: -1321043278025518382}
m_StateMachineBehaviours: []
m_Position: {x: 50, y: 50, z: 0}
m_IKOnFeet: 0
@ -172,6 +144,31 @@ AnimatorState:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!1101 &-1321043278025518382
AnimatorStateTransition:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name:
m_Conditions:
- m_ConditionMode: 1
m_ConditionEvent: Capturing
m_EventTreshold: 0
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: -1078086454310199688}
m_Solo: 0
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0
m_TransitionOffset: 0
m_ExitTime: 0.75
m_HasExitTime: 0
m_HasFixedDuration: 1
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!1101 &-1268957941166067361
AnimatorStateTransition:
m_ObjectHideFlags: 1
@ -197,14 +194,41 @@ AnimatorStateTransition:
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!1102 &-1078086454310199688
AnimatorState:
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Cooldown
m_Speed: 1
m_CycleOffset: 0
m_Transitions:
- {fileID: 1545048956503261888}
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: 99f250a2512a359468eade4429be8fd0, type: 2}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!1102 &-362263174465779627
AnimatorState:
serializedVersion: 5
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Fire
m_Name: Battle
m_Speed: 1
m_CycleOffset: 0
m_Transitions:
@ -226,7 +250,7 @@ AnimatorState:
m_TimeParameter:
--- !u!1107 &-158502340854118920
AnimatorStateMachine:
serializedVersion: 5
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
@ -314,43 +338,49 @@ AnimatorController:
m_DefaultFloat: 0
m_DefaultInt: 0
m_DefaultBool: 0
m_Controller: {fileID: 9100000}
m_Controller: {fileID: 0}
- m_Name: Highlighted
m_Type: 9
m_DefaultFloat: 0
m_DefaultInt: 0
m_DefaultBool: 0
m_Controller: {fileID: 9100000}
m_Controller: {fileID: 0}
- m_Name: Pressed
m_Type: 9
m_DefaultFloat: 0
m_DefaultInt: 0
m_DefaultBool: 0
m_Controller: {fileID: 9100000}
m_Controller: {fileID: 0}
- m_Name: Selected
m_Type: 9
m_DefaultFloat: 0
m_DefaultInt: 0
m_DefaultBool: 0
m_Controller: {fileID: 9100000}
m_Controller: {fileID: 0}
- m_Name: Disabled
m_Type: 9
m_DefaultFloat: 0
m_DefaultInt: 0
m_DefaultBool: 0
m_Controller: {fileID: 9100000}
m_Controller: {fileID: 0}
- m_Name: Producing
m_Type: 4
m_DefaultFloat: 0
m_DefaultInt: 0
m_DefaultBool: 0
m_Controller: {fileID: 9100000}
m_Controller: {fileID: 0}
- m_Name: Battle
m_Type: 4
m_DefaultFloat: 0
m_DefaultInt: 0
m_DefaultBool: 0
m_Controller: {fileID: 9100000}
m_Controller: {fileID: 0}
- m_Name: Capturing
m_Type: 4
m_DefaultFloat: 0
m_DefaultInt: 0
m_DefaultBool: 0
m_Controller: {fileID: 0}
m_AnimatorLayers:
- serializedVersion: 5
m_Name: Base Layer
@ -390,7 +420,7 @@ AnimatorController:
m_Controller: {fileID: 9100000}
--- !u!1102 &81414940235101507
AnimatorState:
serializedVersion: 5
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
@ -467,7 +497,7 @@ AnimationClip:
m_Events: []
--- !u!1102 &553608872663298756
AnimatorState:
serializedVersion: 5
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
@ -494,7 +524,7 @@ AnimatorState:
m_TimeParameter:
--- !u!1102 &1017604588900411636
AnimatorState:
serializedVersion: 5
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
@ -543,6 +573,31 @@ AnimatorStateTransition:
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!1101 &1545048956503261888
AnimatorStateTransition:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name:
m_Conditions:
- m_ConditionMode: 2
m_ConditionEvent: Capturing
m_EventTreshold: 0
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: -1834868961509435414}
m_Solo: 0
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0
m_TransitionOffset: 0
m_ExitTime: 0.9166667
m_HasExitTime: 0
m_HasFixedDuration: 1
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!1101 &2316540140041611674
AnimatorStateTransition:
m_ObjectHideFlags: 1
@ -646,7 +701,7 @@ AnimatorStateTransition:
m_CanTransitionToSelf: 1
--- !u!1107 &3223215449398182094
AnimatorStateMachine:
serializedVersion: 5
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
@ -659,6 +714,9 @@ AnimatorStateMachine:
- serializedVersion: 1
m_State: {fileID: -1834868961509435414}
m_Position: {x: 280, y: 150, z: 0}
- serializedVersion: 1
m_State: {fileID: -1078086454310199688}
m_Position: {x: 280, y: 260, z: 0}
m_ChildStateMachines: []
m_AnyStateTransitions: []
m_EntryTransitions: []
@ -772,8 +830,8 @@ AnimationClip:
m_Events: []
--- !u!1102 &4534976455899429953
AnimatorState:
serializedVersion: 5
m_ObjectHideFlags: 3
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -1135,7 +1193,7 @@ AnimationClip:
m_Events: []
--- !u!1102 &7052444190363486090
AnimatorState:
serializedVersion: 5
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}


+ 377
- 0
Assets/GWConquest/Animations/DistrictIconCooldown.anim View File

@ -0,0 +1,377 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!74 &7400000
AnimationClip:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: DistrictIconCooldown
serializedVersion: 6
m_Legacy: 0
m_Compressed: 0
m_UseHighQualityCurve: 1
m_RotationCurves: []
m_CompressedRotationCurves: []
m_EulerCurves: []
m_PositionCurves: []
m_ScaleCurves: []
m_FloatCurves:
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 1
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_IsActive
path: Background/CooldownCircle
classID: 1
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 1
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_IsActive
path: Background/CooldownIcon
classID: 1
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.85
value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 1.25
value: 0.7
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 1.75
value: 0.7
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 2.15
value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_Color.a
path: Background/CooldownIcon
classID: 114
script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0.7
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.5
value: 0.7
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 1.25
value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 1.75
value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 2.5
value: 0.7
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_Color.a
path: Background/Icon
classID: 114
script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
m_PPtrCurves: []
m_SampleRate: 60
m_WrapMode: 0
m_Bounds:
m_Center: {x: 0, y: 0, z: 0}
m_Extent: {x: 0, y: 0, z: 0}
m_ClipBindingConstant:
genericBindings:
- serializedVersion: 2
path: 1903477620
attribute: 2086281974
script: {fileID: 0}
typeID: 1
customType: 0
isPPtrCurve: 0
- serializedVersion: 2
path: 2060617896
attribute: 2086281974
script: {fileID: 0}
typeID: 1
customType: 0
isPPtrCurve: 0
- serializedVersion: 2
path: 2060617896
attribute: 304273561
script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
typeID: 114
customType: 0
isPPtrCurve: 0
- serializedVersion: 2
path: 1294157189
attribute: 304273561
script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
typeID: 114
customType: 0
isPPtrCurve: 0
pptrCurveMapping: []
m_AnimationClipSettings:
serializedVersion: 2
m_AdditiveReferencePoseClip: {fileID: 0}
m_AdditiveReferencePoseTime: 0
m_StartTime: 0
m_StopTime: 2.5
m_OrientationOffsetY: 0
m_Level: 0
m_CycleOffset: 0
m_HasAdditiveReferencePose: 0
m_LoopTime: 1
m_LoopBlend: 0
m_LoopBlendOrientation: 0
m_LoopBlendPositionY: 0
m_LoopBlendPositionXZ: 0
m_KeepOriginalOrientation: 0
m_KeepOriginalPositionY: 1
m_KeepOriginalPositionXZ: 0
m_HeightFromFeet: 0
m_Mirror: 0
m_EditorCurves:
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 1
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_IsActive
path: Background/CooldownCircle
classID: 1
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 1
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_IsActive
path: Background/CooldownIcon
classID: 1
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.85
value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 1.25
value: 0.7
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 1.75
value: 0.7
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 2.15
value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_Color.a
path: Background/CooldownIcon
classID: 114
script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0.7
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.5
value: 0.7
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 1.25
value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 1.75
value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 2.5
value: 0.7
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_Color.a
path: Background/Icon
classID: 114
script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
m_EulerEditorCurves: []
m_HasGenericRootTransform: 0
m_HasMotionFloatCurves: 0
m_Events: []

+ 8
- 0
Assets/GWConquest/Animations/DistrictIconCooldown.anim.meta View File

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

+ 225
- 5
Assets/GWConquest/Prefabs/UI/DistrictIcon.prefab View File

@ -28,6 +28,7 @@ RectTransform:
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: 6698525327820101171}
m_RootOrder: 1
@ -101,6 +102,7 @@ RectTransform:
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: 8837000425762888635}
m_RootOrder: 3
@ -138,9 +140,10 @@ RectTransform:
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: 2621911208064913515}
m_RootOrder: 4
m_RootOrder: 6
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
@ -211,6 +214,7 @@ RectTransform:
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: 8837000425762888635}
m_RootOrder: 2
@ -246,6 +250,7 @@ RectTransform:
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: 8837000425762888635}
m_RootOrder: 1
@ -284,6 +289,7 @@ RectTransform:
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:
- {fileID: 975320863971053036}
- {fileID: 8962354239726903190}
@ -375,6 +381,7 @@ RectTransform:
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:
- {fileID: 4086673079263786505}
m_Father: {fileID: 8363600674208216601}
@ -465,6 +472,7 @@ RectTransform:
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: 2621911208907321623}
m_RootOrder: 3
@ -561,6 +569,7 @@ RectTransform:
m_LocalRotation: {x: -0, y: -0, z: -0.23251688, w: 0.97259235}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 2621911208638286554}
m_RootOrder: 0
@ -637,9 +646,12 @@ RectTransform:
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1.24, y: 1.24, z: 1.24}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 6443802886500576743}
- {fileID: 3169879512136001048}
- {fileID: 2984693030341278054}
- {fileID: 6070136134566743766}
- {fileID: 2621911209262666223}
- {fileID: 2621911208135885732}
- {fileID: 6228127094338109271}
@ -730,6 +742,7 @@ RectTransform:
m_LocalRotation: {x: -0, y: -0, z: 0.23252034, w: 0.9725916}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: -1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 2621911208867597153}
m_RootOrder: 0
@ -805,9 +818,10 @@ RectTransform:
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: 2621911208064913515}
m_RootOrder: 3
m_RootOrder: 5
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
@ -878,6 +892,7 @@ RectTransform:
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 0.85, y: 0.85, z: 0.85}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 2621911208638286554}
- {fileID: 2621911208867597153}
@ -916,6 +931,7 @@ RectTransform:
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:
- {fileID: 2621911207782916580}
- {fileID: 2621911208936950808}
@ -969,6 +985,7 @@ RectTransform:
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:
- {fileID: 2621911208065702874}
- {fileID: 2621911209258639333}
@ -1025,6 +1042,7 @@ RectTransform:
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:
- {fileID: 3675868522631141907}
- {fileID: 2621911208472225555}
@ -1071,6 +1089,8 @@ MonoBehaviour:
- {fileID: 7732175615502777310}
- {fileID: 3649531905154520175}
- {fileID: 2367613139329943555}
CooldownCircle: {fileID: 8920363402976944406}
CooldownIcon: {fileID: 7494509418504323315}
--- !u!114 &1344012077935187005
MonoBehaviour:
m_ObjectHideFlags: 0
@ -1086,7 +1106,7 @@ MonoBehaviour:
target: {fileID: 0}
--- !u!95 &2633643605963840149
Animator:
serializedVersion: 3
serializedVersion: 4
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
@ -1099,6 +1119,7 @@ Animator:
m_UpdateMode: 0
m_ApplyRootMotion: 0
m_LinearVelocityBlending: 0
m_StabilizeFeet: 0
m_WarningMessage:
m_HasTransformHierarchy: 1
m_AllowConstantClipSamplingOptimization: 1
@ -1193,6 +1214,7 @@ RectTransform:
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: 2621911208638286554}
m_RootOrder: 1
@ -1281,6 +1303,7 @@ RectTransform:
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: 2621911208867597153}
m_RootOrder: 1
@ -1357,9 +1380,10 @@ RectTransform:
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: 2621911208064913515}
m_RootOrder: 2
m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
@ -1458,6 +1482,7 @@ RectTransform:
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: 8837000425762888635}
m_RootOrder: 5
@ -1495,6 +1520,7 @@ RectTransform:
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: 2621911208064913515}
m_RootOrder: 1
@ -1570,6 +1596,7 @@ RectTransform:
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: 3591757799697619954}
m_RootOrder: 0
@ -1643,6 +1670,7 @@ RectTransform:
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: 8837000425762888635}
m_RootOrder: 4
@ -1680,6 +1708,7 @@ RectTransform:
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: 2621911208064913515}
m_RootOrder: 0
@ -1755,6 +1784,7 @@ RectTransform:
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: 3591757799697619954}
m_RootOrder: 1
@ -1802,6 +1832,111 @@ MonoBehaviour:
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
--- !u!1 &3982562984275785233
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 6070136134566743766}
- component: {fileID: 6302473516002707076}
- component: {fileID: 7494509418504323315}
- component: {fileID: 2828742720102860494}
m_Layer: 5
m_Name: CooldownIcon
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
--- !u!224 &6070136134566743766
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3982562984275785233}
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: 2621911208064913515}
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: -10, y: -10}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6302473516002707076
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3982562984275785233}
m_CullTransparentMesh: 0
--- !u!114 &7494509418504323315
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3982562984275785233}
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: 0
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: 43c0c67fc0299df49ad542b1d669f483, type: 3}
m_Type: 0
m_PreserveAspect: 1
m_FillCenter: 1
m_FillMethod: 4
m_FillAmount: 1
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
--- !u!114 &2828742720102860494
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3982562984275785233}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 52c162dc854d2f24fa639ba0623de5ef, type: 3}
m_Name:
m_EditorClassIdentifier:
size: 5.38
spread: 0.8
offsetAngle: 43.15237
offsetDistance: 0
offset: {x: 0, y: -0}
color: {r: 0, g: 0, b: 0, a: 0.5529412}
inset: 0
blendMode: 0
useCasterAlpha: 1
ignoreCasterColor: 0
colorBleedMode: 2
shadowAsSibling: 0
cutout: 0
baked: 0
modifiedFromInspector: 0
bakedShadows: []
--- !u!1 &4210250642177840842
GameObject:
m_ObjectHideFlags: 0
@ -1828,6 +1963,7 @@ RectTransform:
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:
- {fileID: 3291331238021767455}
- {fileID: 2832928536144002898}
@ -1871,6 +2007,7 @@ RectTransform:
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: 6698525327820101171}
m_RootOrder: 0
@ -1946,6 +2083,7 @@ RectTransform:
m_LocalRotation: {x: -0, y: 0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 0.9629764, y: 0.9629881, z: 0.9629881}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 975320863971053036}
m_RootOrder: 0
@ -2019,6 +2157,7 @@ RectTransform:
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: 8837000425762888635}
m_RootOrder: 0
@ -2057,6 +2196,7 @@ RectTransform:
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1.24, y: 1.24, z: 1.24}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 2450006581739935352}
- {fileID: 3527784853284426941}
@ -2148,6 +2288,7 @@ RectTransform:
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 0.79, y: 0.79, z: 0.79}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 7713023655582307560}
- {fileID: 662622465737993192}
@ -2225,7 +2366,7 @@ MonoBehaviour:
m_CallState: 2
--- !u!95 &3004799071622684180
Animator:
serializedVersion: 3
serializedVersion: 4
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
@ -2238,6 +2379,7 @@ Animator:
m_UpdateMode: 0
m_ApplyRootMotion: 0
m_LinearVelocityBlending: 0
m_StabilizeFeet: 0
m_WarningMessage:
m_HasTransformHierarchy: 1
m_AllowConstantClipSamplingOptimization: 1
@ -2270,6 +2412,7 @@ RectTransform:
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1.4588234, y: 1.4588234, z: 1.4588234}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 8363600674208216601}
m_RootOrder: 1
@ -2346,6 +2489,7 @@ RectTransform:
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 0.85, y: 0.85, z: 0.85}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 8363600674208216601}
m_Father: {fileID: 2621911208907321623}
@ -2407,3 +2551,79 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_ShowMaskGraphic: 0
--- !u!1 &8845834974070486738
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 2984693030341278054}
- component: {fileID: 3674541637310360717}
- component: {fileID: 8920363402976944406}
m_Layer: 5
m_Name: CooldownCircle
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
--- !u!224 &2984693030341278054
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8845834974070486738}
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: 2621911208064913515}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &3674541637310360717
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8845834974070486738}
m_CullTransparentMesh: 0
--- !u!114 &8920363402976944406
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8845834974070486738}
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: 0.09019608}
m_RaycastTarget: 0
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: c5c5d1f6b8fa0404ca44f3ea7c937909, type: 3}
m_Type: 3
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
m_FillAmount: 0.576
m_FillClockwise: 1
m_FillOrigin: 2
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1

+ 9
- 8
Assets/GWConquest/Scenes/GalaxyMap.unity View File

@ -27366,6 +27366,7 @@ MonoBehaviour:
RevealChanceSelf: 0.1
RevealChanceAttack: 0.3
shieldsCooldown: 10
districtCaptureCooldown: 30
SpawnAIPlayer: 1
TimeScale: 1
--- !u!4 &426309784
@ -32136,7 +32137,7 @@ PrefabInstance:
- target: {fileID: 4096209424460686482, guid: ada9ee8cb263a4e4ba2f5874cfe9098d,
type: 3}
propertyPath: m_SizeDelta.x
value: 12.521121
value: 12
objectReference: {fileID: 0}
- target: {fileID: 4096209424460686482, guid: ada9ee8cb263a4e4ba2f5874cfe9098d,
type: 3}
@ -32257,7 +32258,7 @@ PrefabInstance:
- target: {fileID: 4411086135142167815, guid: ada9ee8cb263a4e4ba2f5874cfe9098d,
type: 3}
propertyPath: m_AnchoredPosition.x
value: -65.32112
value: -64.8
objectReference: {fileID: 0}
- target: {fileID: 5945601791339210574, guid: ada9ee8cb263a4e4ba2f5874cfe9098d,
type: 3}
@ -71564,7 +71565,7 @@ PrefabInstance:
- target: {fileID: 4096209424460686482, guid: ada9ee8cb263a4e4ba2f5874cfe9098d,
type: 3}
propertyPath: m_SizeDelta.x
value: 12.521121
value: 12
objectReference: {fileID: 0}
- target: {fileID: 4096209424460686483, guid: ada9ee8cb263a4e4ba2f5874cfe9098d,
type: 3}
@ -71615,7 +71616,7 @@ PrefabInstance:
- target: {fileID: 4411086135142167815, guid: ada9ee8cb263a4e4ba2f5874cfe9098d,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 65.391235
value: 64.87012
objectReference: {fileID: 0}
- target: {fileID: 5945601791339210574, guid: ada9ee8cb263a4e4ba2f5874cfe9098d,
type: 3}
@ -115626,7 +115627,7 @@ PrefabInstance:
- target: {fileID: 4096209424460686482, guid: ada9ee8cb263a4e4ba2f5874cfe9098d,
type: 3}
propertyPath: m_SizeDelta.x
value: 12.521121
value: 12
objectReference: {fileID: 0}
- target: {fileID: 4096209424460686482, guid: ada9ee8cb263a4e4ba2f5874cfe9098d,
type: 3}
@ -115752,7 +115753,7 @@ PrefabInstance:
- target: {fileID: 4411086135142167815, guid: ada9ee8cb263a4e4ba2f5874cfe9098d,
type: 3}
propertyPath: m_AnchoredPosition.x
value: -65.32112
value: -64.8
objectReference: {fileID: 0}
- target: {fileID: 5945601791339210574, guid: ada9ee8cb263a4e4ba2f5874cfe9098d,
type: 3}
@ -129381,7 +129382,7 @@ PrefabInstance:
- target: {fileID: 4096209424460686482, guid: ada9ee8cb263a4e4ba2f5874cfe9098d,
type: 3}
propertyPath: m_SizeDelta.x
value: 12.521121
value: 12
objectReference: {fileID: 0}
- target: {fileID: 4096209424460686483, guid: ada9ee8cb263a4e4ba2f5874cfe9098d,
type: 3}
@ -129406,7 +129407,7 @@ PrefabInstance:
- target: {fileID: 4411086135142167815, guid: ada9ee8cb263a4e4ba2f5874cfe9098d,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 65.391235
value: 64.87012
objectReference: {fileID: 0}
- target: {fileID: 5945601791339210574, guid: ada9ee8cb263a4e4ba2f5874cfe9098d,
type: 3}


+ 25
- 3
Assets/GWConquest/Scripts/District.cs View File

@ -229,7 +229,7 @@ namespace GWConquest
}
}
public override void SimulateOwner()
private void CheckControllingChange()
{
Player player = null;
bool moreThanOnePlayer = false;
@ -250,11 +250,33 @@ namespace GWConquest
{
if(player != ControllingPlayer)
{
BoltLog.Info("Player {0} is the only player in district {1}, changing allegiance", player, this);
ControllingPlayer = player;
if(Zone.Formations.Where(f => f.MovementState == FormationMovementState.Idle).FirstOrDefault() != null)
{
if(State.CaptureCooldown >= GameManager.Instance.DistrictCaptureCooldown)
{
BoltLog.Info($"Allegiance changed in district {this} to player {player}");
ControllingPlayer = player;
}
else {
if(State.CaptureCooldown == 0)
{
BoltLog.Info("Player {0} is the only player in district {1}, starting allegiance change...", player, this);
}
State.CaptureCooldown += BoltNetwork.FrameDeltaTime;
}
return;
}
}
}
State.CaptureCooldown = 0;
}
public override void SimulateOwner()
{
CheckControllingChange();
if(ControllingPlayer != null)
{
string producingItem = ProducingItem;


+ 9
- 3
Assets/GWConquest/Scripts/Formation.cs View File

@ -150,6 +150,12 @@ namespace GWConquest
get => (FormationMovementState) State.MovementState;
set => State.MovementState = (int) value;
}
public bool IsMoving {
get => MovementState == FormationMovementState.Moving ||
MovementState == FormationMovementState.PreparingMovement ||
MovementState == FormationMovementState.FinishingMovement;
}
public float ActionCooldown {
get => State.ActionCooldown;
@ -184,7 +190,7 @@ namespace GWConquest
public bool CanMove
{
get => MovementState == FormationMovementState.Idle;
get => !IsMoving;
}
public Planet CurrentPlanet {
@ -231,7 +237,7 @@ namespace GWConquest
public void StartMovingOnPath(List<Zone> path, Formation targetFormation=null)
{
if (path.Count > 1 && entity.IsControlled && MovementState == FormationMovementState.Idle)
if (path.Count > 1 && entity.IsControlled && CanMove)
{
MoveFormationEvent evnt = MoveFormationEvent.Create(GlobalTargets.OnlyServer);
evnt.Formation = entity;
@ -984,7 +990,7 @@ namespace GWConquest
}
public enum FormationMovementState {
Idle, PreparingMovement, FinishingMovement, Moving
Idle, PreparingMovement, FinishingMovement, Moving, Capturing
}


+ 4
- 0
Assets/GWConquest/Scripts/GameManager.cs View File

@ -75,6 +75,10 @@ namespace GWConquest
private float shieldsCooldown;
public float ShieldsCooldown {get => shieldsCooldown * TimeScale;}
[SerializeField]
private float districtCaptureCooldown;
public float DistrictCaptureCooldown {get => districtCaptureCooldown * TimeScale;}
public bool SpawnAIPlayer;
public bool IsLoaded { get; private set; } = false;


+ 1
- 1
Assets/GWConquest/Scripts/UI/BattleUnitIcon.cs View File

@ -353,7 +353,7 @@ namespace GWConquest {
public void UpdateMovementState(Formation f)
{
Animator.SetBool("Moving", f.MovementState != FormationMovementState.Idle);
Animator.SetBool("Moving", f.IsMoving);
CooldownCircle.fillAmount = f.ActionCooldownPercent;
if(f.MovementState == FormationMovementState.FinishingMovement)


+ 23
- 0
Assets/GWConquest/Scripts/UI/DistrictIcon.cs View File

@ -26,6 +26,9 @@ namespace GWConquest
public RectTransform[] PlayerFleetPoints;
public RectTransform[] EnemyFleetPoints;
public Image CooldownCircle;
public Image CooldownIcon;
public District district { get; private set; }
private bool isSelected = false;
@ -134,6 +137,26 @@ namespace GWConquest
{
animator.SetBool("Battle", hasBattle);
}
var captureCooldown = district.State.CaptureCooldown;
var isCapturing = captureCooldown > 0;
if (animator.GetBool("Capturing") != isCapturing)
{
animator.SetBool("Capturing", isCapturing);
if(isCapturing)
{
var player = district.Zone.Formations.FirstOrDefault()?.Player;
if(player != null)
{
CooldownIcon.sprite = player.Faction.FactionLogo;
CooldownIcon.color = Util.UpdateColorRGB(CooldownIcon.color, player.Faction.FactionColor);
}
}
}
if(isCapturing)
{
CooldownCircle.fillAmount = captureCooldown / GameManager.Instance.DistrictCaptureCooldown;
}
}
BattleIcon.SetActive(district.Zone.HasBattle);


+ 1
- 1
Assets/GWConquest/Scripts/UI/TransportUIElement.cs View File

@ -250,7 +250,7 @@ namespace GWConquest
CooldownCircle.fillAmount = Formation.ActionCooldownPercent;
}
GetComponent<Animator>().SetBool("Moving", Formation.MovementState != FormationMovementState.Idle);
GetComponent<Animator>().SetBool("Moving", Formation.IsMoving);
transform.localScale = Vector3.one * FormationScaleFactor;
}


+ 1
- 1
Assets/GWConquest/Scripts/Unit.cs View File

@ -424,7 +424,7 @@ namespace GWConquest
{
if(BattleState == BattleUnitState.Arriving)
{
if(Formation.MovementState != FormationMovementState.Idle)
if(!Formation.IsMoving)
{
BattleState = BattleUnitState.InReserve;
}


BIN
Assets/Photon/PhotonBolt/assemblies/bolt.user.dll View File


BIN
Assets/Photon/PhotonBolt/assemblies/bolt.user.dll.mdb View File


+ 26
- 0
Assets/Photon/PhotonBolt/project.json View File

@ -2494,6 +2494,32 @@
"ExtrapolationMaxFrames": 9,
"SnapMagnitude": 10.0
}
},
{
"Name": "CaptureCooldown",
"Enabled": true,
"Expanded": true,
"ReplicationMode": 1,
"Priority": 1,
"PropertyType": {
"$type": "Photon.Bolt.Compiler.PropertyTypeFloat, bolt.compiler",
"Compression": {
"MinValue": -2048,
"MaxValue": 2048,
"Accuracy": 0.01,
"Pack": 100.0,
"Read": 0.01,
"Shift": 2048.0,
"BitsRequired": 19
}
},
"AssetSettings": {
"$type": "Photon.Bolt.Compiler.PropertyStateSettings, bolt.compiler",
"ExtrapolationErrorTolerance": 0.25,
"_ExtrapolationCorrectionFrames": 6,
"ExtrapolationMaxFrames": 9,
"SnapMagnitude": 10.0
}
}
],
"PacketMaxBits": 512,


Write Preview
Loading…
Cancel
Save