diff --git a/My project/Assets/Resources/Animations/VFX/Die.controller b/My project/Assets/Resources/Animations/VFX/Die.controller index 54d847f2f..fe8cc4993 100644 --- a/My project/Assets/Resources/Animations/VFX/Die.controller +++ b/My project/Assets/Resources/Animations/VFX/Die.controller @@ -1,28 +1,28 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!1107 &-3454595526654174821 -AnimatorStateMachine: - serializedVersion: 6 - m_ObjectHideFlags: 1 +--- !u!91 &9100000 +AnimatorController: + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: Base Layer - m_ChildStates: - - serializedVersion: 1 - m_State: {fileID: -1191155213163811870} - m_Position: {x: 200, y: 0, 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: -1191155213163811870} ---- !u!1102 &-1191155213163811870 + m_Name: Die + serializedVersion: 5 + m_AnimatorParameters: [] + m_AnimatorLayers: + - serializedVersion: 5 + m_Name: Base Layer + m_StateMachine: {fileID: 7073046936234548423} + 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 &1141730395085456778 AnimatorState: serializedVersion: 6 m_ObjectHideFlags: 1 @@ -48,25 +48,54 @@ AnimatorState: m_MirrorParameter: m_CycleOffsetParameter: m_TimeParameter: ---- !u!91 &9100000 -AnimatorController: - m_ObjectHideFlags: 0 +--- !u!1107 &7073046936234548423 +AnimatorStateMachine: + serializedVersion: 6 + m_ObjectHideFlags: 1 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: Die - serializedVersion: 5 - m_AnimatorParameters: [] - m_AnimatorLayers: - - serializedVersion: 5 - m_Name: Base Layer - m_StateMachine: {fileID: -3454595526654174821} - 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} + m_Name: Base Layer + m_ChildStates: + - serializedVersion: 1 + m_State: {fileID: 1141730395085456778} + m_Position: {x: 200, y: 0, z: 0} + - serializedVersion: 1 + m_State: {fileID: 8123698655024568731} + m_Position: {x: 235, y: 65, 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: 1141730395085456778} +--- !u!1102 &8123698655024568731 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: PlayDieHint + 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: 1747f4fc62324ef44b1972ae96f986ba, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: diff --git a/My project/Assets/Resources/Animations/VFX/Heal.controller b/My project/Assets/Resources/Animations/VFX/Heal.controller new file mode 100644 index 000000000..7d50ae990 --- /dev/null +++ b/My project/Assets/Resources/Animations/VFX/Heal.controller @@ -0,0 +1,72 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1107 &-7293370881743505015 +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: 5736214272664341339} + m_Position: {x: 200, y: 0, 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: 5736214272664341339} +--- !u!91 &9100000 +AnimatorController: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Heal + serializedVersion: 5 + m_AnimatorParameters: [] + m_AnimatorLayers: + - serializedVersion: 5 + m_Name: Base Layer + m_StateMachine: {fileID: -7293370881743505015} + 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 &5736214272664341339 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: PlayHeal + 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: 6f3bd8c0b176860489879b98a1178a52, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: diff --git a/My project/Assets/Resources/Animations/VFX/Heal.controller.meta b/My project/Assets/Resources/Animations/VFX/Heal.controller.meta new file mode 100644 index 000000000..fa5547861 --- /dev/null +++ b/My project/Assets/Resources/Animations/VFX/Heal.controller.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 71b2e07ba2bb8174ca0a5baf939a922b +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 9100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/My project/Assets/Resources/Animations/VFX/PlayDie.anim b/My project/Assets/Resources/Animations/VFX/PlayDie.anim index fbfc274b5..26b0fcece 100644 --- a/My project/Assets/Resources/Animations/VFX/PlayDie.anim +++ b/My project/Assets/Resources/Animations/VFX/PlayDie.anim @@ -253,7 +253,7 @@ AnimationClip: m_Level: 0 m_CycleOffset: 0 m_HasAdditiveReferencePose: 0 - m_LoopTime: 0 + m_LoopTime: 1 m_LoopBlend: 0 m_LoopBlendOrientation: 0 m_LoopBlendPositionY: 0 diff --git a/My project/Assets/Resources/Animations/VFX/PlayDie.anim.meta b/My project/Assets/Resources/Animations/VFX/PlayDie.anim.meta index 831e037b5..153055d32 100644 --- a/My project/Assets/Resources/Animations/VFX/PlayDie.anim.meta +++ b/My project/Assets/Resources/Animations/VFX/PlayDie.anim.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 85951e6131b9f8546afcf8b68c2d204f +guid: 1747f4fc62324ef44b1972ae96f986ba NativeFormatImporter: externalObjects: {} mainObjectFileID: 7400000 diff --git a/My project/Assets/Resources/Animations/VFX/PlayDieHint.anim b/My project/Assets/Resources/Animations/VFX/PlayDieHint.anim new file mode 100644 index 000000000..e9f56e239 --- /dev/null +++ b/My project/Assets/Resources/Animations/VFX/PlayDieHint.anim @@ -0,0 +1,453 @@ +%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: PlayDieHint + serializedVersion: 7 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: {x: 0, y: 11.81, z: 0} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + path: + m_ScaleCurves: [] + m_FloatCurves: + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.48333332 + value: 1 + 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.r + path: + classID: 212 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.48333332 + value: 1 + 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.g + path: + classID: 212 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.48333332 + value: 1 + 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.b + path: + classID: 212 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + 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.31666666 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.48333332 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + 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: + classID: 212 + script: {fileID: 0} + flags: 0 + 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: 0 + attribute: 304273561 + script: {fileID: 0} + typeID: 212 + customType: 0 + isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + - serializedVersion: 2 + path: 0 + attribute: 1 + script: {fileID: 0} + typeID: 4 + customType: 0 + isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + - serializedVersion: 2 + path: 0 + attribute: 2526845255 + script: {fileID: 0} + typeID: 212 + customType: 0 + isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + - serializedVersion: 2 + path: 0 + attribute: 4215373228 + script: {fileID: 0} + typeID: 212 + customType: 0 + isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + - serializedVersion: 2 + path: 0 + attribute: 2334886179 + script: {fileID: 0} + typeID: 212 + customType: 0 + isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + pptrCurveMapping: [] + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 1 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_HasAdditiveReferencePose: 0 + m_LoopTime: 0 + 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: + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.48333332 + value: 1 + 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.r + path: + classID: 212 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.48333332 + value: 1 + 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.g + path: + classID: 212 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.48333332 + value: 1 + 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.b + path: + classID: 212 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + 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.31666666 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.48333332 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + 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: + classID: 212 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + 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 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.x + path: + classID: 4 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 11.81 + 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_LocalPosition.y + path: + classID: 4 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + 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 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.z + path: + classID: 4 + script: {fileID: 0} + flags: 0 + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 1 + m_HasMotionFloatCurves: 0 + m_Events: [] diff --git a/My project/Assets/Resources/Animations/VFX/PlayDieHint.anim.meta b/My project/Assets/Resources/Animations/VFX/PlayDieHint.anim.meta new file mode 100644 index 000000000..831e037b5 --- /dev/null +++ b/My project/Assets/Resources/Animations/VFX/PlayDieHint.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 85951e6131b9f8546afcf8b68c2d204f +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/My project/Assets/Resources/Animations/VFX/PlayHeal.anim b/My project/Assets/Resources/Animations/VFX/PlayHeal.anim new file mode 100644 index 000000000..dbd9e7560 --- /dev/null +++ b/My project/Assets/Resources/Animations/VFX/PlayHeal.anim @@ -0,0 +1,525 @@ +%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: PlayHeal + serializedVersion: 7 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: {x: 0, y: 8.57, z: 0} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 0.18333334 + value: {x: 0, y: 11.29, z: 0} + inSlope: {x: 0, y: 2.0800018, z: 0} + outSlope: {x: 0, y: 2.0800018, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 1 + value: {x: 0, y: 11.81, z: 0} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + path: + m_ScaleCurves: [] + m_FloatCurves: + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.45 + value: 1 + 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.r + path: + classID: 212 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.45 + value: 1 + 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.g + path: + classID: 212 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.45 + value: 1 + 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.b + path: + classID: 212 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + 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.18333334 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.45 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + 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: + classID: 212 + script: {fileID: 0} + flags: 0 + 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: 0 + attribute: 1 + script: {fileID: 0} + typeID: 4 + customType: 0 + isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + - serializedVersion: 2 + path: 0 + attribute: 304273561 + script: {fileID: 0} + typeID: 212 + customType: 0 + isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + - serializedVersion: 2 + path: 0 + attribute: 2526845255 + script: {fileID: 0} + typeID: 212 + customType: 0 + isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + - serializedVersion: 2 + path: 0 + attribute: 4215373228 + script: {fileID: 0} + typeID: 212 + customType: 0 + isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + - serializedVersion: 2 + path: 0 + attribute: 2334886179 + script: {fileID: 0} + typeID: 212 + customType: 0 + isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + pptrCurveMapping: [] + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 1 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_HasAdditiveReferencePose: 0 + m_LoopTime: 0 + 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: + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.45 + value: 1 + 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.r + path: + classID: 212 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.45 + value: 1 + 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.g + path: + classID: 212 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.45 + value: 1 + 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.b + path: + classID: 212 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + 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.18333334 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.45 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + 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: + classID: 212 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + 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.18333334 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + 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_LocalPosition.x + path: + classID: 4 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 8.57 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.18333334 + value: 11.29 + inSlope: 2.0800018 + outSlope: 2.0800018 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 11.81 + 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_LocalPosition.y + path: + classID: 4 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + 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.18333334 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + 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_LocalPosition.z + path: + classID: 4 + script: {fileID: 0} + flags: 0 + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 1 + m_HasMotionFloatCurves: 0 + m_Events: [] diff --git a/My project/Assets/Resources/Animations/VFX/PlayHeal.anim.meta b/My project/Assets/Resources/Animations/VFX/PlayHeal.anim.meta new file mode 100644 index 000000000..07cba614e --- /dev/null +++ b/My project/Assets/Resources/Animations/VFX/PlayHeal.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 6f3bd8c0b176860489879b98a1178a52 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/My project/Assets/Resources/ArtResources/TH1UI/Common/ActionIcon/coin.png b/My project/Assets/Resources/ArtResources/TH1UI/Common/ActionIcon/coin.png new file mode 100644 index 000000000..0a1e077b3 Binary files /dev/null and b/My project/Assets/Resources/ArtResources/TH1UI/Common/ActionIcon/coin.png differ diff --git a/My project/Assets/Resources/ArtResources/graphic_resource/Misc/resource.png.meta b/My project/Assets/Resources/ArtResources/TH1UI/Common/ActionIcon/coin.png.meta similarity index 100% rename from My project/Assets/Resources/ArtResources/graphic_resource/Misc/resource.png.meta rename to My project/Assets/Resources/ArtResources/TH1UI/Common/ActionIcon/coin.png.meta diff --git a/My project/Assets/Resources/ArtResources/TH1VFX/TH1VFX_Heal.png b/My project/Assets/Resources/ArtResources/TH1VFX/TH1VFX_Heal.png new file mode 100644 index 000000000..243c4b548 Binary files /dev/null and b/My project/Assets/Resources/ArtResources/TH1VFX/TH1VFX_Heal.png differ diff --git a/My project/Assets/Resources/ArtResources/TH1VFX/TH1VFX_Heal.png.meta b/My project/Assets/Resources/ArtResources/TH1VFX/TH1VFX_Heal.png.meta new file mode 100644 index 000000000..9f393e350 --- /dev/null +++ b/My project/Assets/Resources/ArtResources/TH1VFX/TH1VFX_Heal.png.meta @@ -0,0 +1,114 @@ +fileFormatVersion: 2 +guid: 3fe21a532361e9041b14d5f7826d5b77 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 13 + 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 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 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 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 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 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/My project/Assets/Resources/ArtResources/graphic_resource/Misc/resource.png b/My project/Assets/Resources/ArtResources/graphic_resource/Misc/resource.png deleted file mode 100644 index 90e945505..000000000 Binary files a/My project/Assets/Resources/ArtResources/graphic_resource/Misc/resource.png and /dev/null differ diff --git a/My project/Assets/Resources/DataAssets/AnimDataAssets.asset b/My project/Assets/Resources/DataAssets/AnimDataAssets.asset index 9e34c2c85..114a78b29 100644 --- a/My project/Assets/Resources/DataAssets/AnimDataAssets.asset +++ b/My project/Assets/Resources/DataAssets/AnimDataAssets.asset @@ -16,6 +16,7 @@ MonoBehaviour: AttackArrowTime: 0.3 AttackBombTime: 0.5 AttackReturnAnimTime: 0.15 + AttackBounceWaitAnimTime: 0.05 CounterAnimTime: 0.15 CounterReturnAnimTime: 0.15 BetweenAttackCounterAnimTime: 0.15 diff --git a/My project/Assets/Resources/DataAssets/GridAndResourceDataAssets.asset b/My project/Assets/Resources/DataAssets/GridAndResourceDataAssets.asset index 087ad1d03..c627a13bb 100644 --- a/My project/Assets/Resources/DataAssets/GridAndResourceDataAssets.asset +++ b/My project/Assets/Resources/DataAssets/GridAndResourceDataAssets.asset @@ -94,29 +94,141 @@ MonoBehaviour: Exp: 0 SpriteList: [] - Resource: 19 - Sprite: {fileID: 0} - VarientSprite: 0 + Sprite: {fileID: 21300000, guid: 1d1c6cf339720a443a48749849d6f0be, type: 3} + VarientSprite: 1 ResourceName: "\u9A6C\u4E4B\u795E\u50CF" Exp: 1 - SpriteList: [] + SpriteList: + - IgnoreCivId: 0 + IgnoreForceId: 0 + CivId: 0 + ForceId: 0 + Sprite: {fileID: 21300000, guid: 1d1c6cf339720a443a48749849d6f0be, type: 3} + SpriteGlow: {fileID: 21300000, guid: 1d1c6cf339720a443a48749849d6f0be, type: 3} + Name: "\u8299\u5170\u6735\u9732\u795E\u50CF" + - IgnoreCivId: 0 + IgnoreForceId: 0 + CivId: 1 + ForceId: 1 + Sprite: {fileID: 21300000, guid: 1d1c6cf339720a443a48749849d6f0be, type: 3} + SpriteGlow: {fileID: 21300000, guid: 1d1c6cf339720a443a48749849d6f0be, type: 3} + Name: "\u8299\u5170\u6735\u9732\u795E\u50CF" + - IgnoreCivId: 0 + IgnoreForceId: 0 + CivId: 2 + ForceId: 2 + Sprite: {fileID: 21300000, guid: 1d1c6cf339720a443a48749849d6f0be, type: 3} + SpriteGlow: {fileID: 21300000, guid: 1d1c6cf339720a443a48749849d6f0be, type: 3} + Name: "\u8299\u5170\u6735\u9732\u795E\u50CF" + - IgnoreCivId: 0 + IgnoreForceId: 0 + CivId: 3 + ForceId: 3 + Sprite: {fileID: 21300000, guid: 1d1c6cf339720a443a48749849d6f0be, type: 3} + SpriteGlow: {fileID: 21300000, guid: 1d1c6cf339720a443a48749849d6f0be, type: 3} + Name: "\u8299\u5170\u6735\u9732\u795E\u50CF" - Resource: 20 - Sprite: {fileID: 0} - VarientSprite: 0 + Sprite: {fileID: 21300000, guid: a8d96b5c633e1d8408879d4da675c0d5, type: 3} + VarientSprite: 1 ResourceName: "\u8F66\u4E4B\u795E\u50CF" Exp: 1 - SpriteList: [] + SpriteList: + - IgnoreCivId: 0 + IgnoreForceId: 0 + CivId: 0 + ForceId: 0 + Sprite: {fileID: 21300000, guid: a8d96b5c633e1d8408879d4da675c0d5, type: 3} + SpriteGlow: {fileID: 21300000, guid: a8d96b5c633e1d8408879d4da675c0d5, type: 3} + Name: "\u7EA2\u7F8E\u94C3\u795E\u50CF" + - IgnoreCivId: 0 + IgnoreForceId: 0 + CivId: 1 + ForceId: 1 + Sprite: {fileID: 21300000, guid: a8d96b5c633e1d8408879d4da675c0d5, type: 3} + SpriteGlow: {fileID: 21300000, guid: a8d96b5c633e1d8408879d4da675c0d5, type: 3} + Name: "\u7EA2\u7F8E\u94C3\u795E\u50CF" + - IgnoreCivId: 0 + IgnoreForceId: 0 + CivId: 2 + ForceId: 2 + Sprite: {fileID: 21300000, guid: a8d96b5c633e1d8408879d4da675c0d5, type: 3} + SpriteGlow: {fileID: 21300000, guid: a8d96b5c633e1d8408879d4da675c0d5, type: 3} + Name: "\u7EA2\u7F8E\u94C3\u795E\u50CF" + - IgnoreCivId: 0 + IgnoreForceId: 0 + CivId: 3 + ForceId: 3 + Sprite: {fileID: 21300000, guid: a8d96b5c633e1d8408879d4da675c0d5, type: 3} + SpriteGlow: {fileID: 21300000, guid: a8d96b5c633e1d8408879d4da675c0d5, type: 3} + Name: "\u7EA2\u7F8E\u94C3\u795E\u50CF" - Resource: 21 - Sprite: {fileID: 0} - VarientSprite: 0 + Sprite: {fileID: 21300000, guid: de035b467c0f48d48875912094f08309, type: 3} + VarientSprite: 1 ResourceName: "\u540E\u4E4B\u795E\u50CF" Exp: 1 - SpriteList: [] + SpriteList: + - IgnoreCivId: 0 + IgnoreForceId: 0 + CivId: 0 + ForceId: 0 + Sprite: {fileID: 21300000, guid: de035b467c0f48d48875912094f08309, type: 3} + SpriteGlow: {fileID: 21300000, guid: de035b467c0f48d48875912094f08309, type: 3} + Name: "\u5E15\u79CB\u8389\u795E\u50CF" + - IgnoreCivId: 0 + IgnoreForceId: 0 + CivId: 1 + ForceId: 1 + Sprite: {fileID: 21300000, guid: de035b467c0f48d48875912094f08309, type: 3} + SpriteGlow: {fileID: 21300000, guid: de035b467c0f48d48875912094f08309, type: 3} + Name: "\u5E15\u79CB\u8389\u795E\u50CF" + - IgnoreCivId: 0 + IgnoreForceId: 0 + CivId: 2 + ForceId: 2 + Sprite: {fileID: 21300000, guid: de035b467c0f48d48875912094f08309, type: 3} + SpriteGlow: {fileID: 21300000, guid: de035b467c0f48d48875912094f08309, type: 3} + Name: "\u5E15\u79CB\u8389\u795E\u50CF" + - IgnoreCivId: 0 + IgnoreForceId: 0 + CivId: 3 + ForceId: 3 + Sprite: {fileID: 21300000, guid: de035b467c0f48d48875912094f08309, type: 3} + SpriteGlow: {fileID: 21300000, guid: de035b467c0f48d48875912094f08309, type: 3} + Name: "\u5E15\u79CB\u8389\u795E\u50CF" - Resource: 22 - Sprite: {fileID: 0} - VarientSprite: 0 + Sprite: {fileID: 21300000, guid: dd38214289012a445b9dceeb062876c2, type: 3} + VarientSprite: 1 ResourceName: "\u76F8\u4E4B\u795E\u50CF" Exp: 1 - SpriteList: [] + SpriteList: + - IgnoreCivId: 0 + IgnoreForceId: 0 + CivId: 0 + ForceId: 0 + Sprite: {fileID: 21300000, guid: dd38214289012a445b9dceeb062876c2, type: 3} + SpriteGlow: {fileID: 21300000, guid: dd38214289012a445b9dceeb062876c2, type: 3} + Name: "\u54B2\u591C\u795E\u50CF" + - IgnoreCivId: 0 + IgnoreForceId: 0 + CivId: 1 + ForceId: 1 + Sprite: {fileID: 21300000, guid: dd38214289012a445b9dceeb062876c2, type: 3} + SpriteGlow: {fileID: 21300000, guid: dd38214289012a445b9dceeb062876c2, type: 3} + Name: "\u54B2\u591C\u795E\u50CF" + - IgnoreCivId: 0 + IgnoreForceId: 0 + CivId: 2 + ForceId: 2 + Sprite: {fileID: 21300000, guid: dd38214289012a445b9dceeb062876c2, type: 3} + SpriteGlow: {fileID: 21300000, guid: dd38214289012a445b9dceeb062876c2, type: 3} + Name: "\u54B2\u591C\u795E\u50CF" + - IgnoreCivId: 0 + IgnoreForceId: 0 + CivId: 3 + ForceId: 3 + Sprite: {fileID: 21300000, guid: dd38214289012a445b9dceeb062876c2, type: 3} + SpriteGlow: {fileID: 21300000, guid: dd38214289012a445b9dceeb062876c2, type: 3} + Name: "\u54B2\u591C\u795E\u50CF" - Resource: 23 Sprite: {fileID: 0} VarientSprite: 0 diff --git a/My project/Assets/Resources/Export/AnimDataAssets.asset b/My project/Assets/Resources/Export/AnimDataAssets.asset index 9e34c2c85..114a78b29 100644 --- a/My project/Assets/Resources/Export/AnimDataAssets.asset +++ b/My project/Assets/Resources/Export/AnimDataAssets.asset @@ -16,6 +16,7 @@ MonoBehaviour: AttackArrowTime: 0.3 AttackBombTime: 0.5 AttackReturnAnimTime: 0.15 + AttackBounceWaitAnimTime: 0.05 CounterAnimTime: 0.15 CounterReturnAnimTime: 0.15 BetweenAttackCounterAnimTime: 0.15 diff --git a/My project/Assets/Resources/Export/GridAndResourceDataAssets.asset b/My project/Assets/Resources/Export/GridAndResourceDataAssets.asset index c45dfedef..35d36bece 100644 --- a/My project/Assets/Resources/Export/GridAndResourceDataAssets.asset +++ b/My project/Assets/Resources/Export/GridAndResourceDataAssets.asset @@ -94,29 +94,141 @@ MonoBehaviour: Exp: 0 SpriteList: [] - Resource: 19 - Sprite: {fileID: 0} - VarientSprite: 0 + Sprite: {fileID: 21300000, guid: 1d1c6cf339720a443a48749849d6f0be, type: 3} + VarientSprite: 1 ResourceName: 809 Exp: 1 - SpriteList: [] + SpriteList: + - IgnoreCivId: 0 + IgnoreForceId: 0 + CivId: 0 + ForceId: 0 + Sprite: {fileID: 21300000, guid: 1d1c6cf339720a443a48749849d6f0be, type: 3} + SpriteGlow: {fileID: 21300000, guid: 1d1c6cf339720a443a48749849d6f0be, type: 3} + Name: "\u8299\u5170\u6735\u9732\u795E\u50CF" + - IgnoreCivId: 0 + IgnoreForceId: 0 + CivId: 1 + ForceId: 1 + Sprite: {fileID: 21300000, guid: 1d1c6cf339720a443a48749849d6f0be, type: 3} + SpriteGlow: {fileID: 21300000, guid: 1d1c6cf339720a443a48749849d6f0be, type: 3} + Name: "\u8299\u5170\u6735\u9732\u795E\u50CF" + - IgnoreCivId: 0 + IgnoreForceId: 0 + CivId: 2 + ForceId: 2 + Sprite: {fileID: 21300000, guid: 1d1c6cf339720a443a48749849d6f0be, type: 3} + SpriteGlow: {fileID: 21300000, guid: 1d1c6cf339720a443a48749849d6f0be, type: 3} + Name: "\u8299\u5170\u6735\u9732\u795E\u50CF" + - IgnoreCivId: 0 + IgnoreForceId: 0 + CivId: 3 + ForceId: 3 + Sprite: {fileID: 21300000, guid: 1d1c6cf339720a443a48749849d6f0be, type: 3} + SpriteGlow: {fileID: 21300000, guid: 1d1c6cf339720a443a48749849d6f0be, type: 3} + Name: "\u8299\u5170\u6735\u9732\u795E\u50CF" - Resource: 20 - Sprite: {fileID: 0} - VarientSprite: 0 + Sprite: {fileID: 21300000, guid: a8d96b5c633e1d8408879d4da675c0d5, type: 3} + VarientSprite: 1 ResourceName: 810 Exp: 1 - SpriteList: [] + SpriteList: + - IgnoreCivId: 0 + IgnoreForceId: 0 + CivId: 0 + ForceId: 0 + Sprite: {fileID: 21300000, guid: a8d96b5c633e1d8408879d4da675c0d5, type: 3} + SpriteGlow: {fileID: 21300000, guid: a8d96b5c633e1d8408879d4da675c0d5, type: 3} + Name: "\u7EA2\u7F8E\u94C3\u795E\u50CF" + - IgnoreCivId: 0 + IgnoreForceId: 0 + CivId: 1 + ForceId: 1 + Sprite: {fileID: 21300000, guid: a8d96b5c633e1d8408879d4da675c0d5, type: 3} + SpriteGlow: {fileID: 21300000, guid: a8d96b5c633e1d8408879d4da675c0d5, type: 3} + Name: "\u7EA2\u7F8E\u94C3\u795E\u50CF" + - IgnoreCivId: 0 + IgnoreForceId: 0 + CivId: 2 + ForceId: 2 + Sprite: {fileID: 21300000, guid: a8d96b5c633e1d8408879d4da675c0d5, type: 3} + SpriteGlow: {fileID: 21300000, guid: a8d96b5c633e1d8408879d4da675c0d5, type: 3} + Name: "\u7EA2\u7F8E\u94C3\u795E\u50CF" + - IgnoreCivId: 0 + IgnoreForceId: 0 + CivId: 3 + ForceId: 3 + Sprite: {fileID: 21300000, guid: a8d96b5c633e1d8408879d4da675c0d5, type: 3} + SpriteGlow: {fileID: 21300000, guid: a8d96b5c633e1d8408879d4da675c0d5, type: 3} + Name: "\u7EA2\u7F8E\u94C3\u795E\u50CF" - Resource: 21 - Sprite: {fileID: 0} - VarientSprite: 0 + Sprite: {fileID: 21300000, guid: de035b467c0f48d48875912094f08309, type: 3} + VarientSprite: 1 ResourceName: 811 Exp: 1 - SpriteList: [] + SpriteList: + - IgnoreCivId: 0 + IgnoreForceId: 0 + CivId: 0 + ForceId: 0 + Sprite: {fileID: 21300000, guid: de035b467c0f48d48875912094f08309, type: 3} + SpriteGlow: {fileID: 21300000, guid: de035b467c0f48d48875912094f08309, type: 3} + Name: "\u5E15\u79CB\u8389\u795E\u50CF" + - IgnoreCivId: 0 + IgnoreForceId: 0 + CivId: 1 + ForceId: 1 + Sprite: {fileID: 21300000, guid: de035b467c0f48d48875912094f08309, type: 3} + SpriteGlow: {fileID: 21300000, guid: de035b467c0f48d48875912094f08309, type: 3} + Name: "\u5E15\u79CB\u8389\u795E\u50CF" + - IgnoreCivId: 0 + IgnoreForceId: 0 + CivId: 2 + ForceId: 2 + Sprite: {fileID: 21300000, guid: de035b467c0f48d48875912094f08309, type: 3} + SpriteGlow: {fileID: 21300000, guid: de035b467c0f48d48875912094f08309, type: 3} + Name: "\u5E15\u79CB\u8389\u795E\u50CF" + - IgnoreCivId: 0 + IgnoreForceId: 0 + CivId: 3 + ForceId: 3 + Sprite: {fileID: 21300000, guid: de035b467c0f48d48875912094f08309, type: 3} + SpriteGlow: {fileID: 21300000, guid: de035b467c0f48d48875912094f08309, type: 3} + Name: "\u5E15\u79CB\u8389\u795E\u50CF" - Resource: 22 - Sprite: {fileID: 0} - VarientSprite: 0 + Sprite: {fileID: 21300000, guid: dd38214289012a445b9dceeb062876c2, type: 3} + VarientSprite: 1 ResourceName: 812 Exp: 1 - SpriteList: [] + SpriteList: + - IgnoreCivId: 0 + IgnoreForceId: 0 + CivId: 0 + ForceId: 0 + Sprite: {fileID: 21300000, guid: dd38214289012a445b9dceeb062876c2, type: 3} + SpriteGlow: {fileID: 21300000, guid: dd38214289012a445b9dceeb062876c2, type: 3} + Name: "\u54B2\u591C\u795E\u50CF" + - IgnoreCivId: 0 + IgnoreForceId: 0 + CivId: 1 + ForceId: 1 + Sprite: {fileID: 21300000, guid: dd38214289012a445b9dceeb062876c2, type: 3} + SpriteGlow: {fileID: 21300000, guid: dd38214289012a445b9dceeb062876c2, type: 3} + Name: "\u54B2\u591C\u795E\u50CF" + - IgnoreCivId: 0 + IgnoreForceId: 0 + CivId: 2 + ForceId: 2 + Sprite: {fileID: 21300000, guid: dd38214289012a445b9dceeb062876c2, type: 3} + SpriteGlow: {fileID: 21300000, guid: dd38214289012a445b9dceeb062876c2, type: 3} + Name: "\u54B2\u591C\u795E\u50CF" + - IgnoreCivId: 0 + IgnoreForceId: 0 + CivId: 3 + ForceId: 3 + Sprite: {fileID: 21300000, guid: dd38214289012a445b9dceeb062876c2, type: 3} + SpriteGlow: {fileID: 21300000, guid: dd38214289012a445b9dceeb062876c2, type: 3} + Name: "\u54B2\u591C\u795E\u50CF" - Resource: 23 Sprite: {fileID: 0} VarientSprite: 0 diff --git a/My project/Assets/Resources/Export/Multilingual.asset b/My project/Assets/Resources/Export/Multilingual.asset index 979273047..bcf8ca2f2 100644 --- a/My project/Assets/Resources/Export/Multilingual.asset +++ b/My project/Assets/Resources/Export/Multilingual.asset @@ -5482,3 +5482,57 @@ MonoBehaviour: EN: JP: KR: + - ID: 879 + ZH: "Debug\r\n\u5F00\u5173" + TDZH: + EN: + JP: + KR: + - ID: 880 + ZH: All Unit + TDZH: + EN: + JP: + KR: + - ID: 881 + ZH: All City + TDZH: + EN: + JP: + KR: + - ID: 882 + ZH: All Player + TDZH: + EN: + JP: + KR: + - ID: 883 + ZH: "\u5F53\u524D\u9009\u4E2D" + TDZH: + EN: + JP: + KR: + - ID: 884 + ZH: 'All Unit Panel + + (Coming soon)' + TDZH: + EN: + JP: + KR: + - ID: 885 + ZH: 'All City Panel + + (Coming soon)' + TDZH: + EN: + JP: + KR: + - ID: 886 + ZH: 'All Player Panel + + (Coming soon)' + TDZH: + EN: + JP: + KR: diff --git a/My project/Assets/Resources/Prefab/tilePrefab.prefab b/My project/Assets/Resources/Prefab/tilePrefab.prefab index 58351c1be..a3b8da316 100644 --- a/My project/Assets/Resources/Prefab/tilePrefab.prefab +++ b/My project/Assets/Resources/Prefab/tilePrefab.prefab @@ -1032,6 +1032,7 @@ Transform: - {fileID: 4159564636863943089} - {fileID: 5740121711286652174} - {fileID: 2668736484908105877} + - {fileID: 5794914377394050887} m_Father: {fileID: 1494252107283779432} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &5382825646497074886 @@ -1267,7 +1268,7 @@ Transform: m_GameObject: {fileID: 6764682409150102033} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 8.57, z: 0} + m_LocalPosition: {x: 0, y: 12.25, z: 0} m_LocalScale: {x: 0.5, y: 0.5, z: 0.5} m_ConstrainProportionsScale: 1 m_Children: [] @@ -1335,7 +1336,7 @@ Animator: m_GameObject: {fileID: 6764682409150102033} m_Enabled: 1 m_Avatar: {fileID: 0} - m_Controller: {fileID: 9100000, guid: feef7eb23fea24e4da70776ca1f9a1bf, type: 2} + m_Controller: {fileID: 0} m_CullingMode: 0 m_UpdateMode: 0 m_ApplyRootMotion: 0 @@ -1360,6 +1361,127 @@ MonoBehaviour: m_EditorClassIdentifier: _Animator: {fileID: 5077405085439171614} _ActionOnDisable: 0 +--- !u!1 &7380484021010114014 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5794914377394050887} + - component: {fileID: 7743826317963411044} + - component: {fileID: 8736525687316211164} + - component: {fileID: 4928848108413725515} + m_Layer: 0 + m_Name: Heal + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!4 &5794914377394050887 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7380484021010114014} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 8.57, z: 0} + m_LocalScale: {x: 0.5, y: 0.5, z: 0.5} + m_ConstrainProportionsScale: 1 + m_Children: [] + m_Father: {fileID: 2733067475856537485} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &7743826317963411044 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7380484021010114014} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: -1440529387 + m_SortingLayer: 6 + m_SortingOrder: 0 + m_Sprite: {fileID: 21300000, guid: 3fe21a532361e9041b14d5f7826d5b77, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 14.17, y: 19.84} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!95 &8736525687316211164 +Animator: + serializedVersion: 5 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7380484021010114014} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: 71b2e07ba2bb8174ca0a5baf939a922b, type: 2} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_StabilizeFeet: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorStateOnDisable: 0 + m_WriteDefaultValuesOnDisable: 0 +--- !u!114 &4928848108413725515 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7380484021010114014} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0ad50f81b1d25c441943c37a89ba23f6, type: 3} + m_Name: + m_EditorClassIdentifier: + _Animator: {fileID: 8736525687316211164} + _ActionOnDisable: 0 --- !u!1 &7937754869390280467 GameObject: m_ObjectHideFlags: 0 diff --git a/My project/Assets/Scenes/SampleScene.unity b/My project/Assets/Scenes/SampleScene.unity index 59ab3aa2d..00eb293f8 100644 --- a/My project/Assets/Scenes/SampleScene.unity +++ b/My project/Assets/Scenes/SampleScene.unity @@ -3273,9 +3273,6 @@ RectTransform: - {fileID: 141001620} - {fileID: 1873881355} - {fileID: 1181852328} - - {fileID: 1948549457} - - {fileID: 826951405} - - {fileID: 916180262} m_Father: {fileID: 727821838} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} @@ -4867,9 +4864,9 @@ RectTransform: m_Children: [] m_Father: {fileID: 2037881938} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 100, y: -437.5} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 300, y: 25} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &27952851 @@ -4981,7 +4978,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 6b27f832d22e4a8d916272b644937774, type: 3} m_Name: m_EditorClassIdentifier: - Ban: 0 + Ban: 1 ID: 525 FontID: 0 --- !u!1 &28839384 @@ -5363,9 +5360,9 @@ RectTransform: m_Children: [] m_Father: {fileID: 2037881938} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 100, y: -212.5} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 300, y: 25} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &32295964 @@ -5477,7 +5474,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 6b27f832d22e4a8d916272b644937774, type: 3} m_Name: m_EditorClassIdentifier: - Ban: 0 + Ban: 1 ID: 525 FontID: 0 --- !u!1 &32996731 @@ -6672,9 +6669,9 @@ RectTransform: m_Children: [] m_Father: {fileID: 2037881938} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 100, y: -387.5} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 300, y: 25} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &39165512 @@ -6786,7 +6783,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 6b27f832d22e4a8d916272b644937774, type: 3} m_Name: m_EditorClassIdentifier: - Ban: 0 + Ban: 1 ID: 525 FontID: 0 --- !u!1 &40279711 @@ -24731,9 +24728,9 @@ RectTransform: m_Children: [] m_Father: {fileID: 2037881938} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 100, y: -12.5} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 300, y: 25} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &159842477 @@ -24845,7 +24842,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 6b27f832d22e4a8d916272b644937774, type: 3} m_Name: m_EditorClassIdentifier: - Ban: 0 + Ban: 1 ID: 525 FontID: 0 --- !u!1 &159869824 @@ -26036,6 +26033,158 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 167019285} m_CullTransparentMesh: 1 +--- !u!1 &167059304 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 167059305} + - component: {fileID: 167059307} + - component: {fileID: 167059306} + - component: {fileID: 167059308} + m_Layer: 5 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &167059305 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 167059304} + 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: 1476914282} + 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: 200, y: 50} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &167059306 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 167059304} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, 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_text: 'All Unit Panel + + (Coming soon)' + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 36 + m_fontSizeBase: 36 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 1 + m_VerticalAlignment: 256 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!222 &167059307 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 167059304} + m_CullTransparentMesh: 1 +--- !u!114 &167059308 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 167059304} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 6b27f832d22e4a8d916272b644937774, type: 3} + m_Name: + m_EditorClassIdentifier: + Ban: 0 + ID: 884 + FontID: 0 --- !u!1 &167507839 GameObject: m_ObjectHideFlags: 0 @@ -27147,6 +27296,42 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 176627818} m_CullTransparentMesh: 1 +--- !u!1 &177691647 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 177691648} + m_Layer: 5 + m_Name: Sliding Area + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &177691648 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 177691647} + 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: 2147063389} + m_Father: {fileID: 1437506162} + 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: -20, y: -20} + m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &177945079 GameObject: m_ObjectHideFlags: 0 @@ -40204,7 +40389,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 6b27f832d22e4a8d916272b644937774, type: 3} m_Name: m_EditorClassIdentifier: - Ban: 0 + Ban: 1 ID: 558 FontID: 0 --- !u!1 &262074801 @@ -41724,6 +41909,45 @@ MonoBehaviour: m_ChildScaleWidth: 0 m_ChildScaleHeight: 0 m_ReverseArrangement: 0 +--- !u!1 &277711471 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 277711472} + m_Layer: 5 + m_Name: PanelGroup + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &277711472 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 277711471} + 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: 1659472803} + - {fileID: 1476914282} + - {fileID: 767869044} + - {fileID: 338211199} + m_Father: {fileID: 1941701034} + 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: -8.6366, y: -20.619} + m_SizeDelta: {x: 1246.7649, y: 429.46} + m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &278192235 GameObject: m_ObjectHideFlags: 0 @@ -47045,6 +47269,156 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 305756381} m_CullTransparentMesh: 1 +--- !u!1 &306326471 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 306326472} + - component: {fileID: 306326475} + - component: {fileID: 306326474} + - component: {fileID: 306326473} + m_Layer: 5 + m_Name: CarryUnitTypeValue (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &306326472 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 306326471} + 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: 1490675093} + 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: 151, y: -147.5} + m_SizeDelta: {x: 300, y: 50} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &306326473 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 306326471} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 6b27f832d22e4a8d916272b644937774, type: 3} + m_Name: + m_EditorClassIdentifier: + Ban: 1 + ID: 525 + FontID: 0 +--- !u!114 &306326474 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 306326471} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, 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_text: Warrior + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 36 + m_fontSizeBase: 36 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 1 + m_VerticalAlignment: 256 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!222 &306326475 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 306326471} + m_CullTransparentMesh: 1 --- !u!1 &307115198 GameObject: m_ObjectHideFlags: 0 @@ -49240,7 +49614,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 6b27f832d22e4a8d916272b644937774, type: 3} m_Name: m_EditorClassIdentifier: - Ban: 0 + Ban: 1 ID: 559 FontID: 0 --- !u!1 &318690673 @@ -52840,6 +53214,42 @@ MonoBehaviour: m_ChildScaleWidth: 0 m_ChildScaleHeight: 0 m_ReverseArrangement: 0 +--- !u!1 &338211198 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 338211199} + m_Layer: 5 + m_Name: AllPlayer + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &338211199 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 338211198} + 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: 1978281965} + m_Father: {fileID: 277711472} + 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: -194, y: 22} + m_SizeDelta: {x: 714.51, y: 317.16} + m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &339810431 GameObject: m_ObjectHideFlags: 0 @@ -58490,6 +58900,156 @@ GameObject: m_CorrespondingSourceObject: {fileID: 7500223967712906730, guid: 22e7129c30952984ab3892b269915f07, type: 3} m_PrefabInstance: {fileID: 1843639838} m_PrefabAsset: {fileID: 0} +--- !u!1 &376216897 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 376216898} + - component: {fileID: 376216901} + - component: {fileID: 376216900} + - component: {fileID: 376216899} + m_Layer: 5 + m_Name: UnitStrategy + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &376216898 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 376216897} + 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: 1490675093} + 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: -106, y: 187} + m_SizeDelta: {x: 200, y: 50} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &376216899 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 376216897} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 6b27f832d22e4a8d916272b644937774, type: 3} + m_Name: + m_EditorClassIdentifier: + Ban: 1 + ID: 554 + FontID: 0 +--- !u!114 &376216900 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 376216897} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, 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_text: Unit Type + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 36 + m_fontSizeBase: 36 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 1 + m_VerticalAlignment: 256 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!222 &376216901 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 376216897} + m_CullTransparentMesh: 1 --- !u!1 &376528320 GameObject: m_ObjectHideFlags: 0 @@ -71874,6 +72434,156 @@ RectTransform: m_AnchoredPosition: {x: 304, y: -24} m_SizeDelta: {x: 496, y: 120} m_Pivot: {x: 0, y: 1} +--- !u!1 &480527759 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 480527760} + - component: {fileID: 480527763} + - component: {fileID: 480527762} + - component: {fileID: 480527761} + m_Layer: 5 + m_Name: GiantTypeTitle (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &480527760 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 480527759} + 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: 1490675093} + 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: -106, y: 128} + m_SizeDelta: {x: 200, y: 50} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &480527761 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 480527759} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 6b27f832d22e4a8d916272b644937774, type: 3} + m_Name: + m_EditorClassIdentifier: + Ban: 1 + ID: 555 + FontID: 0 +--- !u!114 &480527762 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 480527759} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, 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_text: Giant Type + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 36 + m_fontSizeBase: 36 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 1 + m_VerticalAlignment: 256 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!222 &480527763 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 480527759} + m_CullTransparentMesh: 1 --- !u!1 &481147137 GameObject: m_ObjectHideFlags: 0 @@ -72085,7 +72795,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 6b27f832d22e4a8d916272b644937774, type: 3} m_Name: m_EditorClassIdentifier: - Ban: 0 + Ban: 1 ID: 525 FontID: 0 --- !u!1 &483399412 @@ -75503,6 +76213,156 @@ MonoBehaviour: Ban: 0 ID: 113 FontID: 0 +--- !u!1 &509066659 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 509066660} + - component: {fileID: 509066662} + - component: {fileID: 509066661} + - component: {fileID: 509066663} + m_Layer: 5 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &509066660 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 509066659} + 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: 922514230} + 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.00035572, y: -0.000060834} + m_SizeDelta: {x: 164.35, y: 50.276} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &509066661 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 509066659} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, 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_text: "Debug\n\u5F00\u5173" + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: f74d73acde897024090a352531df919f, type: 2} + m_sharedMaterial: {fileID: -5194638153132371293, guid: f74d73acde897024090a352531df919f, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4278190080 + m_fontColor: {r: 0, g: 0, b: 0, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 36 + m_fontSizeBase: 36 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 512 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!222 &509066662 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 509066659} + m_CullTransparentMesh: 1 +--- !u!114 &509066663 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 509066659} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 6b27f832d22e4a8d916272b644937774, type: 3} + m_Name: + m_EditorClassIdentifier: + Ban: 0 + ID: 879 + FontID: 0 --- !u!1 &509250266 GameObject: m_ObjectHideFlags: 0 @@ -78450,9 +79310,9 @@ RectTransform: m_Children: [] m_Father: {fileID: 2037881938} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 100, y: -462.5} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 300, y: 25} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &529944974 @@ -78564,7 +79424,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 6b27f832d22e4a8d916272b644937774, type: 3} m_Name: m_EditorClassIdentifier: - Ban: 0 + Ban: 1 ID: 525 FontID: 0 --- !u!1 &530606207 @@ -79010,6 +79870,156 @@ RectTransform: m_AnchoredPosition: {x: 185.625, y: -40} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &532367823 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 532367824} + - component: {fileID: 532367827} + - component: {fileID: 532367826} + - component: {fileID: 532367825} + m_Layer: 5 + m_Name: UnitTypeValue (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &532367824 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 532367823} + 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: 1490675093} + 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: 151, y: 187.5} + m_SizeDelta: {x: 300, y: 50} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &532367825 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 532367823} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 6b27f832d22e4a8d916272b644937774, type: 3} + m_Name: + m_EditorClassIdentifier: + Ban: 1 + ID: 525 + FontID: 0 +--- !u!114 &532367826 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 532367823} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, 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_text: Warrior + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 36 + m_fontSizeBase: 36 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 1 + m_VerticalAlignment: 256 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!222 &532367827 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 532367823} + m_CullTransparentMesh: 1 --- !u!1 &532646900 GameObject: m_ObjectHideFlags: 0 @@ -79385,6 +80395,45 @@ MonoBehaviour: Ban: 0 ID: 124 FontID: 0 +--- !u!1 &535651047 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 535651048} + m_Layer: 5 + m_Name: ButtonGroup + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &535651048 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 535651047} + 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: 807486577} + - {fileID: 1565932927} + - {fileID: 537249592} + - {fileID: 1916649793} + m_Father: {fileID: 1941701034} + 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: -224.94336, y: 214.73236} + m_SizeDelta: {x: 636.7966, y: 41.2353} + m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &535943795 GameObject: m_ObjectHideFlags: 0 @@ -79513,6 +80562,127 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &537249591 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 537249592} + - component: {fileID: 537249595} + - component: {fileID: 537249594} + - component: {fileID: 537249593} + m_Layer: 5 + m_Name: ButtonAllPlayer + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &537249592 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 537249591} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0.5, y: 0.5, z: 0.5} + m_ConstrainProportionsScale: 1 + m_Children: + - {fileID: 1554509887} + m_Father: {fileID: 535651048} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 380.9, y: -20.618} + m_SizeDelta: {x: 201.2032, y: 82.4433} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &537249593 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 537249591} + 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: 456df2002119cef408d4f82287de1f2a, type: 3} + m_Type: 1 + 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!222 &537249594 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 537249591} + m_CullTransparentMesh: 1 +--- !u!114 &537249595 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 537249591} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_WrapAround: 0 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 537249593} + m_OnClick: + m_PersistentCalls: + m_Calls: [] --- !u!1 &537281925 GameObject: m_ObjectHideFlags: 0 @@ -81011,9 +82181,9 @@ RectTransform: m_Children: [] m_Father: {fileID: 2037881938} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 100, y: -187.5} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 300, y: 25} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &546650943 @@ -81125,7 +82295,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 6b27f832d22e4a8d916272b644937774, type: 3} m_Name: m_EditorClassIdentifier: - Ban: 0 + Ban: 1 ID: 525 FontID: 0 --- !u!1 &547050257 @@ -82660,9 +83830,9 @@ RectTransform: m_Children: [] m_Father: {fileID: 2037881938} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 100, y: -87.5} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 300, y: 25} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &556410201 @@ -82774,7 +83944,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 6b27f832d22e4a8d916272b644937774, type: 3} m_Name: m_EditorClassIdentifier: - Ban: 0 + Ban: 1 ID: 525 FontID: 0 --- !u!1 &556971218 @@ -85958,7 +87128,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 6b27f832d22e4a8d916272b644937774, type: 3} m_Name: m_EditorClassIdentifier: - Ban: 0 + Ban: 1 ID: 525 FontID: 0 --- !u!1 &575282043 @@ -96563,6 +97733,156 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 630547110} m_CullTransparentMesh: 1 +--- !u!1 &630557040 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 630557041} + - component: {fileID: 630557044} + - component: {fileID: 630557043} + - component: {fileID: 630557042} + m_Layer: 5 + m_Name: CarryUnitTypeTitle (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &630557041 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 630557040} + 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: 1490675093} + 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: -106, y: -148} + m_SizeDelta: {x: 200, y: 50} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &630557042 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 630557040} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 6b27f832d22e4a8d916272b644937774, type: 3} + m_Name: + m_EditorClassIdentifier: + Ban: 1 + ID: 556 + FontID: 0 +--- !u!114 &630557043 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 630557040} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, 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_text: Carry Unit + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 36 + m_fontSizeBase: 36 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 1 + m_VerticalAlignment: 256 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!222 &630557044 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 630557040} + m_CullTransparentMesh: 1 --- !u!1 &630817771 GameObject: m_ObjectHideFlags: 0 @@ -99788,7 +101108,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 6b27f832d22e4a8d916272b644937774, type: 3} m_Name: m_EditorClassIdentifier: - Ban: 0 + Ban: 1 ID: 525 FontID: 0 --- !u!1 &660771214 @@ -102211,9 +103531,9 @@ RectTransform: m_Children: [] m_Father: {fileID: 2037881938} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 100, y: -162.5} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 300, y: 25} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &677869775 @@ -102325,7 +103645,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 6b27f832d22e4a8d916272b644937774, type: 3} m_Name: m_EditorClassIdentifier: - Ban: 0 + Ban: 1 ID: 525 FontID: 0 --- !u!1 &678408116 @@ -102361,9 +103681,9 @@ RectTransform: m_Children: [] m_Father: {fileID: 2037881938} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 100, y: -112.5} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 300, y: 25} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &678408118 @@ -102475,7 +103795,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 6b27f832d22e4a8d916272b644937774, type: 3} m_Name: m_EditorClassIdentifier: - Ban: 0 + Ban: 1 ID: 525 FontID: 0 --- !u!1 &678817581 @@ -106311,13 +107631,13 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: NoAI: 0 - FullSight: 1 + FullSight: 0 AIActionTime: 0.5 AIAllTech: 1 AIMoreMoney: 1 LandThreshold: 0.3 AnimationSpeed: 1 - DebugMode: 0 + DebugMode: 1 DebugHideCenterMessage: 1 cityCount: 30 unitCount: 0 @@ -109745,6 +111065,7 @@ RectTransform: - {fileID: 1957837102} - {fileID: 167019286} - {fileID: 502671953} + - {fileID: 1941701034} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} @@ -112769,9 +114090,9 @@ RectTransform: m_Children: [] m_Father: {fileID: 2037881938} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 100, y: -412.5} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 300, y: 25} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &747640488 @@ -112883,7 +114204,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 6b27f832d22e4a8d916272b644937774, type: 3} m_Name: m_EditorClassIdentifier: - Ban: 0 + Ban: 1 ID: 525 FontID: 0 --- !u!1 &747694912 @@ -115790,6 +117111,42 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 767557417} m_CullTransparentMesh: 1 +--- !u!1 &767869043 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 767869044} + m_Layer: 5 + m_Name: AllCity + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &767869044 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 767869043} + 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: 1490516541} + m_Father: {fileID: 277711472} + 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: -194, y: 22} + m_SizeDelta: {x: 714.51, y: 317.16} + m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &768140991 GameObject: m_ObjectHideFlags: 0 @@ -116446,7 +117803,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 6b27f832d22e4a8d916272b644937774, type: 3} m_Name: m_EditorClassIdentifier: - Ban: 0 + Ban: 1 ID: 560 FontID: 0 --- !u!1 &770639342 @@ -120814,9 +122171,9 @@ RectTransform: m_Children: [] m_Father: {fileID: 2037881938} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 100, y: -362.5} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 300, y: 25} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &794998195 @@ -120928,7 +122285,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 6b27f832d22e4a8d916272b644937774, type: 3} m_Name: m_EditorClassIdentifier: - Ban: 0 + Ban: 1 ID: 525 FontID: 0 --- !u!1 &796249949 @@ -122587,6 +123944,127 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 807099208} m_CullTransparentMesh: 1 +--- !u!1 &807486576 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 807486577} + - component: {fileID: 807486580} + - component: {fileID: 807486579} + - component: {fileID: 807486578} + m_Layer: 5 + m_Name: ButtonAllUnit + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &807486577 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 807486576} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0.5, y: 0.5, z: 0.5} + m_ConstrainProportionsScale: 1 + m_Children: + - {fileID: 1049825515} + m_Father: {fileID: 535651048} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 159.8, y: -20.618} + m_SizeDelta: {x: 201.2032, y: 82.4433} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &807486578 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 807486576} + 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: 456df2002119cef408d4f82287de1f2a, type: 3} + m_Type: 1 + 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!222 &807486579 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 807486576} + m_CullTransparentMesh: 1 +--- !u!114 &807486580 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 807486576} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_WrapAround: 0 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 807486578} + m_OnClick: + m_PersistentCalls: + m_Calls: [] --- !u!1 &808162461 GameObject: m_ObjectHideFlags: 0 @@ -125599,7 +127077,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &826951405 RectTransform: m_ObjectHideFlags: 0 @@ -125607,7 +127085,7 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 826951404} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.5, y: 0.5, z: 0.5} m_ConstrainProportionsScale: 1 @@ -125629,11 +127107,12 @@ RectTransform: - {fileID: 575027450} - {fileID: 1316641041} - {fileID: 1912229140} - m_Father: {fileID: 20834529} + - {fileID: 1490675093} + m_Father: {fileID: 1659472803} 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: 1348, y: 35} + m_AnchoredPosition: {x: -30, y: 0.000030518} m_SizeDelta: {x: 1300, y: 624.216} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &827492218 @@ -127512,9 +128991,9 @@ RectTransform: m_Children: [] m_Father: {fileID: 2037881938} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 100, y: -62.5} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 300, y: 25} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &840466609 @@ -127626,7 +129105,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 6b27f832d22e4a8d916272b644937774, type: 3} m_Name: m_EditorClassIdentifier: - Ban: 0 + Ban: 1 ID: 525 FontID: 0 --- !u!1 &843309633 @@ -138913,17 +140392,17 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 916180261} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.5, y: 0.5, z: 0.5} m_ConstrainProportionsScale: 1 m_Children: - {fileID: 1640501328} - m_Father: {fileID: 20834529} + m_Father: {fileID: 1659472803} 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: 1348, y: 35} + m_AnchoredPosition: {x: -30, y: 0.000030518} m_SizeDelta: {x: 1300, y: 624.216} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &916469806 @@ -139517,6 +140996,127 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 922029289} m_CullTransparentMesh: 1 +--- !u!1 &922514229 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 922514230} + - component: {fileID: 922514233} + - component: {fileID: 922514232} + - component: {fileID: 922514231} + m_Layer: 5 + m_Name: ButtonStart + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &922514230 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 922514229} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0.5, y: 0.5, z: 0.5} + m_ConstrainProportionsScale: 1 + m_Children: + - {fileID: 509066660} + m_Father: {fileID: 1941701034} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 129.65833, y: -20.618} + m_SizeDelta: {x: 167.8957, y: 154.7431} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &922514231 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 922514229} + 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: 456df2002119cef408d4f82287de1f2a, type: 3} + m_Type: 1 + 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!222 &922514232 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 922514229} + m_CullTransparentMesh: 1 +--- !u!114 &922514233 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 922514229} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_WrapAround: 0 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 922514231} + m_OnClick: + m_PersistentCalls: + m_Calls: [] --- !u!1 &922598069 GameObject: m_ObjectHideFlags: 0 @@ -159569,6 +161169,156 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1049764869} m_CullTransparentMesh: 1 +--- !u!1 &1049825514 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1049825515} + - component: {fileID: 1049825517} + - component: {fileID: 1049825516} + - component: {fileID: 1049825518} + m_Layer: 5 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1049825515 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1049825514} + 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: 807486577} + 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.00035572, y: -0.000060834} + m_SizeDelta: {x: 164.35, y: 50.276} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1049825516 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1049825514} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, 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_text: All Unit + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4278190080 + m_fontColor: {r: 0, g: 0, b: 0, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 36 + m_fontSizeBase: 36 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 512 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!222 &1049825517 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1049825514} + m_CullTransparentMesh: 1 +--- !u!114 &1049825518 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1049825514} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 6b27f832d22e4a8d916272b644937774, type: 3} + m_Name: + m_EditorClassIdentifier: + Ban: 0 + ID: 880 + FontID: 0 --- !u!1 &1050923572 GameObject: m_ObjectHideFlags: 0 @@ -168587,6 +170337,156 @@ MonoBehaviour: Ban: 0 ID: 45 FontID: 0 +--- !u!1 &1098761168 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1098761169} + - component: {fileID: 1098761171} + - component: {fileID: 1098761170} + - component: {fileID: 1098761172} + m_Layer: 5 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1098761169 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1098761168} + 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: 1565932927} + 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.00035572, y: -0.000060834} + m_SizeDelta: {x: 164.35, y: 50.276} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1098761170 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1098761168} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, 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_text: All City + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4278190080 + m_fontColor: {r: 0, g: 0, b: 0, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 36 + m_fontSizeBase: 36 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 512 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!222 &1098761171 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1098761168} + m_CullTransparentMesh: 1 +--- !u!114 &1098761172 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1098761168} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 6b27f832d22e4a8d916272b644937774, type: 3} + m_Name: + m_EditorClassIdentifier: + Ban: 0 + ID: 881 + FontID: 0 --- !u!1 &1099518224 GameObject: m_ObjectHideFlags: 0 @@ -172902,9 +174802,9 @@ RectTransform: m_Children: [] m_Father: {fileID: 2037881938} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 100, y: -262.5} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 300, y: 25} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1121894644 @@ -173016,7 +174916,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 6b27f832d22e4a8d916272b644937774, type: 3} m_Name: m_EditorClassIdentifier: - Ban: 0 + Ban: 1 ID: 525 FontID: 0 --- !u!1 &1122613611 @@ -184131,6 +186031,96 @@ MonoBehaviour: m_ChildScaleWidth: 0 m_ChildScaleHeight: 0 m_ReverseArrangement: 0 +--- !u!1 &1203963738 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1203963739} + - component: {fileID: 1203963742} + - component: {fileID: 1203963741} + - component: {fileID: 1203963740} + m_Layer: 5 + m_Name: Viewport + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1203963739 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1203963738} + 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: 1950037240} + m_Father: {fileID: 2000418047} + 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: -17, y: 0} + m_Pivot: {x: 0, y: 1} +--- !u!114 &1203963740 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1203963738} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 31a19414c41e5ae4aae2af33fee712f6, type: 3} + m_Name: + m_EditorClassIdentifier: + m_ShowMaskGraphic: 0 +--- !u!114 &1203963741 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1203963738} + 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: 10917, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 + 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!222 &1203963742 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1203963738} + m_CullTransparentMesh: 1 --- !u!1 &1203992986 GameObject: m_ObjectHideFlags: 0 @@ -193336,7 +195326,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 6b27f832d22e4a8d916272b644937774, type: 3} m_Name: m_EditorClassIdentifier: - Ban: 0 + Ban: 1 ID: 554 FontID: 0 --- !u!1 &1261346018 @@ -200835,7 +202825,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 6b27f832d22e4a8d916272b644937774, type: 3} m_Name: m_EditorClassIdentifier: - Ban: 0 + Ban: 1 ID: 561 FontID: 0 --- !u!1 &1317745035 @@ -202083,9 +204073,9 @@ RectTransform: m_Children: [] m_Father: {fileID: 2037881938} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 100, y: -237.5} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 300, y: 25} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1327500238 @@ -202197,7 +204187,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 6b27f832d22e4a8d916272b644937774, type: 3} m_Name: m_EditorClassIdentifier: - Ban: 0 + Ban: 1 ID: 525 FontID: 0 --- !u!1 &1328177941 @@ -202802,9 +204792,9 @@ RectTransform: m_Children: [] m_Father: {fileID: 2037881938} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 100, y: -137.5} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 300, y: 25} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1334060612 @@ -202916,7 +204906,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 6b27f832d22e4a8d916272b644937774, type: 3} m_Name: m_EditorClassIdentifier: - Ban: 0 + Ban: 1 ID: 525 FontID: 0 --- !u!1 &1334746549 @@ -204268,6 +206258,156 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &1345571097 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1345571098} + - component: {fileID: 1345571101} + - component: {fileID: 1345571100} + - component: {fileID: 1345571099} + m_Layer: 5 + m_Name: GiantTypeValue (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1345571098 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1345571097} + 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: 1490675093} + 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: 151, y: 128.5} + m_SizeDelta: {x: 300, y: 50} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1345571099 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1345571097} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 6b27f832d22e4a8d916272b644937774, type: 3} + m_Name: + m_EditorClassIdentifier: + Ban: 1 + ID: 525 + FontID: 0 +--- !u!114 &1345571100 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1345571097} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, 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_text: Warrior + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 36 + m_fontSizeBase: 36 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 1 + m_VerticalAlignment: 256 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!222 &1345571101 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1345571097} + m_CullTransparentMesh: 1 --- !u!1 &1345907017 GameObject: m_ObjectHideFlags: 0 @@ -211107,7 +213247,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 6b27f832d22e4a8d916272b644937774, type: 3} m_Name: m_EditorClassIdentifier: - Ban: 0 + Ban: 1 ID: 525 FontID: 0 --- !u!1 &1397101497 @@ -216422,6 +218562,132 @@ MonoBehaviour: m_ChildScaleWidth: 0 m_ChildScaleHeight: 0 m_ReverseArrangement: 0 +--- !u!1 &1437506161 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1437506162} + - component: {fileID: 1437506165} + - component: {fileID: 1437506164} + - component: {fileID: 1437506163} + m_Layer: 5 + m_Name: Scrollbar Vertical + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1437506162 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1437506161} + 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: 177691648} + m_Father: {fileID: 2000418047} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 20, y: -17} + m_Pivot: {x: 1, y: 1} +--- !u!114 &1437506163 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1437506161} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 2a4db7a114972834c8e4117be1d82ba3, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_WrapAround: 0 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 2147063390} + m_HandleRect: {fileID: 2147063389} + m_Direction: 2 + m_Value: 0 + m_Size: 0.98725957 + m_NumberOfSteps: 0 + m_OnValueChanged: + m_PersistentCalls: + m_Calls: [] +--- !u!114 &1437506164 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1437506161} + 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: 10907, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 + 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!222 &1437506165 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1437506161} + m_CullTransparentMesh: 1 --- !u!1 &1439114085 GameObject: m_ObjectHideFlags: 0 @@ -216894,9 +219160,9 @@ RectTransform: m_Children: [] m_Father: {fileID: 2037881938} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 100, y: -312.5} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 300, y: 25} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1445080665 @@ -217008,7 +219274,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 6b27f832d22e4a8d916272b644937774, type: 3} m_Name: m_EditorClassIdentifier: - Ban: 0 + Ban: 1 ID: 525 FontID: 0 --- !u!1 &1445219396 @@ -219926,6 +222192,83 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1475711400} m_CullTransparentMesh: 1 +--- !u!1 &1476914281 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1476914282} + - component: {fileID: 1476914284} + - component: {fileID: 1476914283} + m_Layer: 5 + m_Name: AllUnit + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &1476914282 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1476914281} + 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: 167059305} + - {fileID: 2000418047} + m_Father: {fileID: 277711472} + 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: -194, y: -233.34213} + m_SizeDelta: {x: 714.51, y: 827.8444} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1476914283 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1476914281} + 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: 0, g: 0, b: 0, a: 0.92156863} + 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: 456df2002119cef408d4f82287de1f2a, type: 3} + m_Type: 1 + 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!222 &1476914284 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1476914281} + m_CullTransparentMesh: 1 --- !u!1 &1477613724 GameObject: m_ObjectHideFlags: 0 @@ -222177,6 +224520,199 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1489787967} m_CullTransparentMesh: 1 +--- !u!1 &1490516540 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1490516541} + - component: {fileID: 1490516543} + - component: {fileID: 1490516542} + - component: {fileID: 1490516544} + m_Layer: 5 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1490516541 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1490516540} + 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: 767869044} + 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: 200, y: 50} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1490516542 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1490516540} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, 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_text: 'All City Panel + + (Coming soon)' + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 36 + m_fontSizeBase: 36 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 1 + m_VerticalAlignment: 256 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!222 &1490516543 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1490516540} + m_CullTransparentMesh: 1 +--- !u!114 &1490516544 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1490516540} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 6b27f832d22e4a8d916272b644937774, type: 3} + m_Name: + m_EditorClassIdentifier: + Ban: 0 + ID: 885 + FontID: 0 +--- !u!1 &1490675092 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1490675093} + m_Layer: 5 + m_Name: AI + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1490675093 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1490675092} + 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: 376216898} + - {fileID: 532367824} + - {fileID: 480527760} + - {fileID: 1345571098} + - {fileID: 630557041} + - {fileID: 306326472} + m_Father: {fileID: 826951405} + 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: 113.976, y: 47.5} + m_SizeDelta: {x: 377.991, y: 444} + m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &1490971530 GameObject: m_ObjectHideFlags: 0 @@ -226334,7 +228870,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 6b27f832d22e4a8d916272b644937774, type: 3} m_Name: m_EditorClassIdentifier: - Ban: 0 + Ban: 1 ID: 556 FontID: 0 --- !u!1 &1512730876 @@ -230131,9 +232667,9 @@ RectTransform: m_Children: [] m_Father: {fileID: 2037881938} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 100, y: -37.5} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 300, y: 25} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1547699866 @@ -230245,7 +232781,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 6b27f832d22e4a8d916272b644937774, type: 3} m_Name: m_EditorClassIdentifier: - Ban: 0 + Ban: 1 ID: 525 FontID: 0 --- !u!1 &1548054966 @@ -231239,6 +233775,156 @@ MonoBehaviour: Ban: 0 ID: 9 FontID: 0 +--- !u!1 &1554509886 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1554509887} + - component: {fileID: 1554509889} + - component: {fileID: 1554509888} + - component: {fileID: 1554509890} + m_Layer: 5 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1554509887 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1554509886} + 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: 537249592} + 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.00035572, y: -0.000060834} + m_SizeDelta: {x: 164.35, y: 50.276} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1554509888 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1554509886} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, 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_text: All Player + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4278190080 + m_fontColor: {r: 0, g: 0, b: 0, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 36 + m_fontSizeBase: 36 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 512 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!222 &1554509889 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1554509886} + m_CullTransparentMesh: 1 +--- !u!114 &1554509890 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1554509886} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 6b27f832d22e4a8d916272b644937774, type: 3} + m_Name: + m_EditorClassIdentifier: + Ban: 0 + ID: 882 + FontID: 0 --- !u!1001 &1555704271 PrefabInstance: m_ObjectHideFlags: 0 @@ -233217,6 +235903,127 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1565915759} m_CullTransparentMesh: 1 +--- !u!1 &1565932926 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1565932927} + - component: {fileID: 1565932930} + - component: {fileID: 1565932929} + - component: {fileID: 1565932928} + m_Layer: 5 + m_Name: ButtonAllCity + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1565932927 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1565932926} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0.5, y: 0.5, z: 0.5} + m_ConstrainProportionsScale: 1 + m_Children: + - {fileID: 1098761169} + m_Father: {fileID: 535651048} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 270, y: -20.618} + m_SizeDelta: {x: 201.2032, y: 82.4433} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1565932928 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1565932926} + 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: 456df2002119cef408d4f82287de1f2a, type: 3} + m_Type: 1 + 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!222 &1565932929 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1565932926} + m_CullTransparentMesh: 1 +--- !u!114 &1565932930 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1565932926} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_WrapAround: 0 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 1565932928} + m_OnClick: + m_PersistentCalls: + m_Calls: [] --- !u!1 &1566153958 GameObject: m_ObjectHideFlags: 0 @@ -240621,9 +243428,9 @@ RectTransform: m_Children: [] m_Father: {fileID: 2037881938} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 100, y: -512.5} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 300, y: 25} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1617539015 @@ -240735,7 +243542,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 6b27f832d22e4a8d916272b644937774, type: 3} m_Name: m_EditorClassIdentifier: - Ban: 0 + Ban: 1 ID: 525 FontID: 0 --- !u!1 &1618282852 @@ -246275,7 +249082,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 6b27f832d22e4a8d916272b644937774, type: 3} m_Name: m_EditorClassIdentifier: - Ban: 0 + Ban: 1 ID: 555 FontID: 0 --- !u!1 &1653142617 @@ -247101,6 +249908,44 @@ MonoBehaviour: GridMiscActionType: 0 SkillType: 0 TechType: 0 +--- !u!1 &1659472802 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1659472803} + m_Layer: 5 + m_Name: Selected + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1659472803 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1659472802} + 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: 1948549457} + - {fileID: 826951405} + - {fileID: 916180262} + m_Father: {fileID: 277711472} + 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: -194, y: 22} + m_SizeDelta: {x: 714.5078, y: 317.1568} + m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &1659714141 GameObject: m_ObjectHideFlags: 0 @@ -250104,7 +252949,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 6b27f832d22e4a8d916272b644937774, type: 3} m_Name: m_EditorClassIdentifier: - Ban: 0 + Ban: 1 ID: 557 FontID: 0 --- !u!1 &1685755298 @@ -256108,7 +258953,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 6b27f832d22e4a8d916272b644937774, type: 3} m_Name: m_EditorClassIdentifier: - Ban: 0 + Ban: 1 ID: 525 FontID: 0 --- !u!1 &1720893350 @@ -282812,9 +285657,9 @@ RectTransform: m_Children: [] m_Father: {fileID: 2037881938} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 100, y: -487.5} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 300, y: 25} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1893451286 @@ -282926,7 +285771,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 6b27f832d22e4a8d916272b644937774, type: 3} m_Name: m_EditorClassIdentifier: - Ban: 0 + Ban: 1 ID: 525 FontID: 0 --- !u!1 &1894622022 @@ -284701,7 +287546,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 6b27f832d22e4a8d916272b644937774, type: 3} m_Name: m_EditorClassIdentifier: - Ban: 0 + Ban: 1 ID: 525 FontID: 0 --- !u!1 &1914879233 @@ -285047,6 +287892,127 @@ RectTransform: m_AnchoredPosition: {x: 293.41272, y: -57.63585} m_SizeDelta: {x: 195.1389, y: 99.5382} m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &1916649792 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1916649793} + - component: {fileID: 1916649796} + - component: {fileID: 1916649795} + - component: {fileID: 1916649794} + m_Layer: 5 + m_Name: ButtonSelected + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1916649793 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1916649792} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0.5, y: 0.5, z: 0.5} + m_ConstrainProportionsScale: 1 + m_Children: + - {fileID: 1985149295} + m_Father: {fileID: 535651048} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 49, y: -20.618} + m_SizeDelta: {x: 201.2032, y: 82.4433} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1916649794 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1916649792} + 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: 456df2002119cef408d4f82287de1f2a, type: 3} + m_Type: 1 + 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!222 &1916649795 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1916649792} + m_CullTransparentMesh: 1 +--- !u!114 &1916649796 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1916649792} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_WrapAround: 0 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 1916649794} + m_OnClick: + m_PersistentCalls: + m_Calls: [] --- !u!1 &1917048056 GameObject: m_ObjectHideFlags: 0 @@ -288348,6 +291314,44 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1941069756} m_CullTransparentMesh: 1 +--- !u!1 &1941701033 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1941701034} + m_Layer: 5 + m_Name: DebugPanel + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1941701034 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1941701033} + 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: 922514230} + - {fileID: 535651048} + - {fileID: 277711472} + m_Father: {fileID: 727821838} + 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: 230, y: 204.65} + m_SizeDelta: {x: 1460, y: 470.7} + m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &1942345567 GameObject: m_ObjectHideFlags: 0 @@ -289591,7 +292595,7 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1948549456} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.5, y: 0.5, z: 0.5} m_ConstrainProportionsScale: 1 @@ -289599,11 +292603,11 @@ RectTransform: - {fileID: 1139719342} - {fileID: 1632644411} - {fileID: 1766509758} - m_Father: {fileID: 20834529} + m_Father: {fileID: 1659472803} 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: 1348, y: 35} + m_AnchoredPosition: {x: -30, y: 0.000030518} m_SizeDelta: {x: 1300, y: 624.216} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &1949347644 @@ -289854,6 +292858,41 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1949881768} m_CullTransparentMesh: 1 +--- !u!1 &1950037239 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1950037240} + m_Layer: 5 + m_Name: Content + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1950037240 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1950037239} + 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: 1203963739} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: -0.000033017237} + m_SizeDelta: {x: 0, y: 300} + m_Pivot: {x: 0, y: 1} --- !u!1 &1950455943 GameObject: m_ObjectHideFlags: 0 @@ -294459,6 +297498,158 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: TechType: 4 +--- !u!1 &1978281964 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1978281965} + - component: {fileID: 1978281967} + - component: {fileID: 1978281966} + - component: {fileID: 1978281968} + m_Layer: 5 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1978281965 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1978281964} + 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: 338211199} + 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: 200, y: 50} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1978281966 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1978281964} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, 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_text: 'All Player Panel + + (Coming soon)' + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 36 + m_fontSizeBase: 36 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 1 + m_VerticalAlignment: 256 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!222 &1978281967 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1978281964} + m_CullTransparentMesh: 1 +--- !u!114 &1978281968 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1978281964} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 6b27f832d22e4a8d916272b644937774, type: 3} + m_Name: + m_EditorClassIdentifier: + Ban: 0 + ID: 886 + FontID: 0 --- !u!1 &1978431104 GameObject: m_ObjectHideFlags: 0 @@ -296703,6 +299894,156 @@ MonoBehaviour: Ban: 0 ID: 124 FontID: 0 +--- !u!1 &1985149294 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1985149295} + - component: {fileID: 1985149297} + - component: {fileID: 1985149296} + - component: {fileID: 1985149298} + m_Layer: 5 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1985149295 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1985149294} + 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: 1916649793} + 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.00035572, y: -0.000060834} + m_SizeDelta: {x: 164.35, y: 50.276} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1985149296 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1985149294} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, 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_text: "\u5F53\u524D\u9009\u4E2D" + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: f74d73acde897024090a352531df919f, type: 2} + m_sharedMaterial: {fileID: -5194638153132371293, guid: f74d73acde897024090a352531df919f, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4278190080 + m_fontColor: {r: 0, g: 0, b: 0, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 36 + m_fontSizeBase: 36 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 512 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!222 &1985149297 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1985149294} + m_CullTransparentMesh: 1 +--- !u!114 &1985149298 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1985149294} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 6b27f832d22e4a8d916272b644937774, type: 3} + m_Name: + m_EditorClassIdentifier: + Ban: 0 + ID: 883 + FontID: 0 --- !u!1 &1986116995 GameObject: m_ObjectHideFlags: 0 @@ -298022,6 +301363,114 @@ Grid: m_CellGap: {x: 0, y: 0, z: 0} m_CellLayout: 2 m_CellSwizzle: 0 +--- !u!1 &2000418046 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2000418047} + - component: {fileID: 2000418050} + - component: {fileID: 2000418049} + - component: {fileID: 2000418048} + m_Layer: 5 + m_Name: Scroll View + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2000418047 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2000418046} + 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: 1203963739} + - {fileID: 1437506162} + m_Father: {fileID: 1476914282} + 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.00024032, y: -0.0016} + m_SizeDelta: {x: 714.51, y: 762.7616} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &2000418048 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2000418046} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1aa08ab6e0800fa44ae55d278d1423e3, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Content: {fileID: 1950037240} + m_Horizontal: 0 + m_Vertical: 1 + m_MovementType: 1 + m_Elasticity: 0.1 + m_Inertia: 1 + m_DecelerationRate: 0.135 + m_ScrollSensitivity: 1 + m_Viewport: {fileID: 1203963739} + m_HorizontalScrollbar: {fileID: 0} + m_VerticalScrollbar: {fileID: 1437506163} + m_HorizontalScrollbarVisibility: 2 + m_VerticalScrollbarVisibility: 2 + m_HorizontalScrollbarSpacing: -3 + m_VerticalScrollbarSpacing: -3 + m_OnValueChanged: + m_PersistentCalls: + m_Calls: [] +--- !u!114 &2000418049 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2000418046} + m_Enabled: 0 + 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.392} + 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: 10907, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 + 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!222 &2000418050 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2000418046} + m_CullTransparentMesh: 1 --- !u!1 &2001447731 stripped GameObject: m_CorrespondingSourceObject: {fileID: 3798604079713007527, guid: 1d228afdf5912fc4eb50f79e43c932bb, type: 3} @@ -300040,9 +303489,9 @@ RectTransform: m_Children: [] m_Father: {fileID: 2037881938} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 100, y: -287.5} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 300, y: 25} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &2016099709 @@ -300154,7 +303603,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 6b27f832d22e4a8d916272b644937774, type: 3} m_Name: m_EditorClassIdentifier: - Ban: 0 + Ban: 1 ID: 525 FontID: 0 --- !u!1 &2016676684 @@ -306599,9 +310048,9 @@ RectTransform: m_Children: [] m_Father: {fileID: 2037881938} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 100, y: -337.5} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 300, y: 25} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &2058035844 @@ -306713,7 +310162,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 6b27f832d22e4a8d916272b644937774, type: 3} m_Name: m_EditorClassIdentifier: - Ban: 0 + Ban: 1 ID: 525 FontID: 0 --- !u!1 &2058272817 @@ -321768,6 +325217,81 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!1 &2147063388 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2147063389} + - component: {fileID: 2147063391} + - component: {fileID: 2147063390} + m_Layer: 5 + m_Name: Handle + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2147063389 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2147063388} + 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: 177691648} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 0.98725957} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 20, y: 20} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &2147063390 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2147063388} + 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: 10905, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 + 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!222 &2147063391 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2147063388} + m_CullTransparentMesh: 1 --- !u!224 &45469183185783503 RectTransform: m_ObjectHideFlags: 0 diff --git a/My project/Assets/Scripts/Data/GridData.cs b/My project/Assets/Scripts/Data/GridData.cs index 4fd24ab05..0fe1fe9de 100644 --- a/My project/Assets/Scripts/Data/GridData.cs +++ b/My project/Assets/Scripts/Data/GridData.cs @@ -256,10 +256,13 @@ namespace RuntimeData //播放特效专用的RenderMark public bool VFXRenderMarkHurt = false; public bool VFXRenderMarkDie = false; + public bool VFXRenderMarkDieHintStart = false; + public bool VFXRenderMarkDieHintEnd = false; public bool VFXRenderMarkTreasure = false; public bool VFXRenderMarkHeal = false; public bool VFXRenderMarkFog = false; public bool VFXRenderMark = false; + diff --git a/My project/Assets/Scripts/Data/UnitData.cs b/My project/Assets/Scripts/Data/UnitData.cs index 8040d07d7..cfdaf788e 100644 --- a/My project/Assets/Scripts/Data/UnitData.cs +++ b/My project/Assets/Scripts/Data/UnitData.cs @@ -175,6 +175,7 @@ namespace RuntimeData public bool AttackRenderMarkNeedBack; public AttackAnimType AttackRenderMarkAttackAnimType; public bool BounceRenderMark; + public float BounceRenderMakrWaitTime; // 军团编号 public uint LegionId; diff --git a/My project/Assets/Scripts/DataAssetsScript/AnimDataAssets.cs b/My project/Assets/Scripts/DataAssetsScript/AnimDataAssets.cs index 6f36f8bee..2a73fa0c4 100644 --- a/My project/Assets/Scripts/DataAssetsScript/AnimDataAssets.cs +++ b/My project/Assets/Scripts/DataAssetsScript/AnimDataAssets.cs @@ -11,6 +11,7 @@ public class AnimDataAssets : ScriptableObject public float AttackArrowTime; public float AttackBombTime; public float AttackReturnAnimTime; + public float AttackBounceWaitAnimTime; public float CounterAnimTime; public float CounterReturnAnimTime; diff --git a/My project/Assets/Scripts/DataAssetsScript/GridObjectDataAssets.cs b/My project/Assets/Scripts/DataAssetsScript/GridObjectDataAssets.cs index 5c87cd371..5bd83060e 100644 --- a/My project/Assets/Scripts/DataAssetsScript/GridObjectDataAssets.cs +++ b/My project/Assets/Scripts/DataAssetsScript/GridObjectDataAssets.cs @@ -129,6 +129,22 @@ public class GridAndResourceDataAssets : ScriptableObject return wonderInfo.Sprite; } + public Sprite GetResourceSprite(ResourceType resource, PlayerData playerData) + { + if (!GetResourceInfo(resource, out var resourceInfo)) + return null; + if (resourceInfo.VarientSprite) + { + foreach(var t in resourceInfo.SpriteList) + { + if ((t.IgnoreCivId || t.CivId == playerData.PlayerCivId) + && (t.IgnoreForceId || t.ForceId == playerData.PlayerForceId)) + return t.Sprite; + } + } + return resourceInfo.Sprite; + } + public string GetWonderName(WonderLibrary wonder,PlayerData playerData) { if (!GetWonderInfo(wonder, out var wonderInfo)) @@ -149,6 +165,8 @@ public class GridAndResourceDataAssets : ScriptableObject return resourceInfo.ResourceName; } + + public ResourceType GetMillLikeRelative(ResourceType resource) { if (resource == ResourceType.Sawmill) diff --git a/My project/Assets/Scripts/Logic/Action/ActionLogic.cs b/My project/Assets/Scripts/Logic/Action/ActionLogic.cs index c1895a08f..6bd336e67 100644 --- a/My project/Assets/Scripts/Logic/Action/ActionLogic.cs +++ b/My project/Assets/Scripts/Logic/Action/ActionLogic.cs @@ -1476,6 +1476,7 @@ namespace Logic.Action return false; actionParams.PlayerData.PlayerWealth -= info.Cost; Main.UnitLogic.UnitTypeTransform(actionParams.UnitData,_actionId.UnitType); + Main.PlayerLogic.UpdateSight(actionParams.MapData,actionParams.PlayerData,actionParams.MapData.GridMap.GetAroundGridIdList(2,gridData)); actionParams.UnitData.RenderMark = true; return true; } @@ -1506,6 +1507,7 @@ namespace Logic.Action else if (terrPlayerData != actionParams.PlayerData) recoverV = 2; actionParams.UnitData.Health += recoverV; + gridData.VFXRenderMarkHeal = true; if (actionParams.UnitData.Health > actionParams.UnitData.GetMaxHealth()) actionParams.UnitData.Health = actionParams.UnitData.GetMaxHealth(); ret = true; diff --git a/My project/Assets/Scripts/Logic/City/CityLogic.cs b/My project/Assets/Scripts/Logic/City/CityLogic.cs index 485d9255b..7407df252 100644 --- a/My project/Assets/Scripts/Logic/City/CityLogic.cs +++ b/My project/Assets/Scripts/Logic/City/CityLogic.cs @@ -68,8 +68,7 @@ namespace Logic } else { - Debug.Log(gridData.Id); - Debug.Log(gridData.Pos.X + " " + gridData.Pos.Y); + //这里有个情况，就是在ROGridMap没有生成之前，就已经对玩家的第一个city进行了一次cityupdatelevel } @@ -188,17 +187,20 @@ namespace Logic public void CityLevelUpActionExpand(MapData mapData, CityData cityData) { if (!mapData.GetGridDataByCityId(cityData.Id, out var gridData)) return; + if (!mapData.GetPlayerDataByCityId(cityData.Id, out var playerData)) return; var aroundGridList = mapData.GridMap.GetAroundGridData(2, 2, gridData); - + + Main.PlayerLogic.UpdateSight(mapData,playerData,mapData.GridMap.GetAroundGridIdList(2,gridData)); + var newTerritoryArea = new List(); foreach (var aroundGrid in aroundGridList) { + if (mapData.GetPlayerDataByTerritoryGridId(aroundGrid.Id, out var playerData1)) continue; newTerritoryArea.Add(aroundGrid.Id); } cityData.Territory.UpdateTerritory(newTerritoryArea); - if (!mapData.GetPlayerDataByCityId(cityData.Id, out var playerData)) - return; + var playerTerritoryGridIdSet = mapData.GetPlayerTerritoryGridIdSet(playerData.Id); foreach (var gridId in playerTerritoryGridIdSet) @@ -207,6 +209,8 @@ namespace Logic continue; gridData1.RenderMark = true; } + + } diff --git a/My project/Assets/Scripts/Logic/Input/InputLogic.cs b/My project/Assets/Scripts/Logic/Input/InputLogic.cs index a36eebbc2..27cf33f3f 100644 --- a/My project/Assets/Scripts/Logic/Input/InputLogic.cs +++ b/My project/Assets/Scripts/Logic/Input/InputLogic.cs @@ -87,8 +87,8 @@ namespace Logic public void Update() { - //如果锁了input - if (inputLock) return; + //如果锁了input 但是DebugMode不会锁定input + if (inputLock &&!DebugCenter.Instance.DebugMode) return; if (Input.GetMouseButtonDown(0)) { mouseLastDownPosition = Input.mousePosition; diff --git a/My project/Assets/Scripts/Logic/Player/PlayerLogic.cs b/My project/Assets/Scripts/Logic/Player/PlayerLogic.cs index 0f62c34bd..83d8f675c 100644 --- a/My project/Assets/Scripts/Logic/Player/PlayerLogic.cs +++ b/My project/Assets/Scripts/Logic/Player/PlayerLogic.cs @@ -631,7 +631,7 @@ namespace Logic var endPos = Camera.main.ScreenToWorldPoint(moneyPanel.position); - main.MapRenderer.ProjectileManager.CreateProjectileMulti(main,mapData,startPos,endPos,ProjectileType.Coin,ProjectileMoveType.CoinParabola,Main.CityLogic.GetCityStarsPerTurn(mapData,city)); + main.MapRenderer.ProjectileManager.CreateProjectileMulti(main,mapData,startPos,endPos,ProjectileType.Coin,ProjectileMoveType.CoinParabola,Main.CityLogic.GetCityStarsPerTurn(mapData,city),0.05f); } } @@ -646,7 +646,23 @@ namespace Logic if (!mapData.GetCapitalCityDataByPlayerId(playerData.Id, out var city)) continue; //处理发现tower的情况 if (gridData.Resource == ResourceType.Tower) - Main.CityLogic.CityUpdateExp(mapData,city,1); + { + //临时做法，用来播放VFX,获取Main，理应向MapData写入一个VFX的RenderMark的 + var main = GameObject.Find("Main").GetComponent
(); + var v1 = Table.Instance.GridToWorld(gridData); + mapData.GetGridDataByCityId(city.Id, out var g2); + var v2 = Table.Instance.GridToWorld(g2); + + Timer.Instance.TimerRegister(Main.CityLogic, () => + { + main.MapRenderer.ROGridMap[g2.Id].SetBounceAnim(); + Main.CityLogic.CityUpdateExp(mapData,city,1); + }, + Table.Instance.AnimDataAssets.ProjectileCityExpMoveTime); + + main.MapRenderer.ProjectileManager.CreateProjectile(main,mapData,v1,v2,ProjectileType.CityExp,ProjectileMoveType.CityExpHighParabola); + } + gridData.RenderMark = true; if (mapData.GetUnitDataByGid(id, out var unitData)) unitData.RenderMark = true; diff --git a/My project/Assets/Scripts/Logic/Unit/UnitLogic.cs b/My project/Assets/Scripts/Logic/Unit/UnitLogic.cs index 2ecc678b0..a1d71b988 100644 --- a/My project/Assets/Scripts/Logic/Unit/UnitLogic.cs +++ b/My project/Assets/Scripts/Logic/Unit/UnitLogic.cs @@ -152,23 +152,31 @@ namespace Logic unit1.OnKill(unit2,mapData); unit2.Health -= dmg1; - - - - //如果是近战且目标位置不是山或者有山的科技，且目标不在水里. if (unit1.GetAttackRange() == 1 && grid2.Terrain == TerrainType.Land && (grid2.Feature != TerrainFeature.Mountain || player1.TechTree.CheckIfHasTech(TechType.Climbing))) { //立刻死亡并播放受伤动画,必须先处理死亡，再处理移动，不然gridToUnit的dict会出错 Main.UnitLogic.Die(mapData, unit2); - grid2.VFXRenderMarkHurt = true; - grid2.VFXRenderMarkDie = true; + + + unit1.AttackRenderMark = false; //移动过去并更新视野 MoveTo(mapData, unit1, grid2,MoveType.AttackMove); //关闭unit1的rendermakr中 攻击完需要移动回来的开关 //unit1.AttackRenderMarkNeedBack = false; + Timer.Instance.TimerRegister(unit2, () => + { + var main = GameObject.Find("Main").GetComponent
(); + main.MapRenderer.ROGridMap[grid2.Id].SetBounceAnim(); + grid2.VFXRenderMarkHurt = true; + grid2.VFXRenderMarkDie = true; + + },0.1f); + + + } else { @@ -179,6 +187,9 @@ namespace Logic unit2.RenderMark = true; grid2.VFXRenderMarkHurt = true; grid2.VFXRenderMarkDie = true; + var main = GameObject.Find("Main").GetComponent
(); + main.MapRenderer.ROGridMap[grid2.Id].SetBounceAnim(); + },attackWait); } @@ -198,6 +209,7 @@ namespace Logic unit2.Health -= dmg1; unit2.RenderMark = true; unit2.BounceRenderMark = true; + unit2.BounceRenderMakrWaitTime = Table.Instance.AnimDataAssets.AttackBounceWaitAnimTime; grid2.VFXRenderMarkHurt = true; }, @@ -231,7 +243,7 @@ namespace Logic grid1.VFXRenderMarkDie = true; }, counterAttackWait); - + if (!Table.Instance.QueryUnitHasSkill(unit2.UnitType, SkillType.STATIC)) unit2.Exp++; } //否则，就是双方正常互相消耗血量 else @@ -242,6 +254,7 @@ namespace Logic unit1.Health -= dmg2; unit1.RenderMark = true; unit1.BounceRenderMark = true; + unit1.BounceRenderMakrWaitTime = Table.Instance.AnimDataAssets.AttackBounceWaitAnimTime; grid1.VFXRenderMarkHurt = true; grid1.VFXRenderMarkFog = true; }, @@ -616,6 +629,9 @@ namespace Logic public void BoatToLand(MapData mapData, UnitData unitData) { + if (!mapData.GetPlayerDataByUnitId(unitData.Id, out var player) + ||!mapData.GetGridDataByUnitId(unitData.Id,out var grid)) return; + Main.PlayerLogic.UpdateSight(mapData,player,mapData.GridMap.GetAroundGridIdList(unitData.GetSightRange(),grid)); unitData.UnitType = unitData.CarryUnitType; unitData.GiantType = unitData.CarryGiantType; unitData.Exp = unitData.CarryExp; diff --git a/My project/Assets/Scripts/TH1Renderer/GridRenderer.cs b/My project/Assets/Scripts/TH1Renderer/GridRenderer.cs index c4997ab31..ffc846db7 100644 --- a/My project/Assets/Scripts/TH1Renderer/GridRenderer.cs +++ b/My project/Assets/Scripts/TH1Renderer/GridRenderer.cs @@ -60,9 +60,16 @@ namespace TH1Renderer public AnimationClip DieVFXAnim; private bool _playDieVFX; private bool _isPlayingDieVFX; + public AnimationClip DieHintVFXAnim; + private bool _playDieHintVFX; + private bool _isPlayingDieHintVFX; + private bool _stopDieHintVFX; public AnimationClip TreasureVFXAnim; private bool _playTreasureVFX; private bool _isPlayingTreasureVFX; + public AnimationClip HealVFXAnim; + private bool _playHealVFX; + private bool _isPlayingHealVFX; bool renderVeteran = false; @@ -105,6 +112,16 @@ namespace TH1Renderer _gridData.VFXRenderMarkDie = false; SetDieVFXAnim(); } + if (_gridData.VFXRenderMarkDieHintStart) + { + _gridData.VFXRenderMarkDieHintStart = false; + SetDieHintVFXAnim(); + } + if (_gridData.VFXRenderMarkDieHintEnd) + { + _gridData.VFXRenderMarkDieHintEnd = false; + SetStopDieHintVFXAnim(); + } if (_gridData.VFXRenderMarkTreasure) { _gridData.VFXRenderMarkTreasure = false; @@ -115,6 +132,11 @@ namespace TH1Renderer _gridData.VFXRenderMarkFog = false; SetFogAnim(false); } + if (_gridData.VFXRenderMarkHeal) + { + _gridData.VFXRenderMarkHeal = false; + SetHealVFXAnim(); + } _ROGrid.transform.Find("Effect/Fire").gameObject.SetActive(false); //判断是否着火 @@ -162,11 +184,27 @@ namespace TH1Renderer _playDieVFX = false; PlayDieVFX(); } + if (_playDieHintVFX) + { + _playDieHintVFX = false; + PlayDieHintVFX(); + } + if (_stopDieHintVFX) + { + _stopDieHintVFX = false; + StopDieHintVFX(); + } + if (_playTreasureVFX) { _playTreasureVFX = false; PlayTreasureVFX(); } + if (_playHealVFX) + { + _playHealVFX = false; + PlayHealVFX(); + } if (_playFogEffect) { @@ -232,7 +270,9 @@ namespace TH1Renderer FogEffectAnim = Resources.Load("Animations/VFX/PlayFog"); HurtVFXAnim = Resources.Load("Animations/VFX/PlayAttack"); DieVFXAnim = Resources.Load("Animations/VFX/PlayDie"); + DieHintVFXAnim = Resources.Load("Animations/VFX/PlayDieHint"); TreasureVFXAnim = Resources.Load("Animations/VFX/PlayTreasure"); + HealVFXAnim = Resources.Load("Animations/VFX/PlayHeal"); //UpdateBorder();fog自带updateborder } @@ -450,10 +490,10 @@ namespace TH1Renderer ResourceType.CityCenter => hasCity ? null : Resources.Load($"ArtResources/TH1Miscs/TH1Misc_Tribe"), ResourceType.Treasure => Resources.Load($"ArtResources/TH1Miscs/TH1Misc_Treasure"), ResourceType.Starfish => Resources.Load($"ArtResources/TH1Miscs/TH1Misc_Starfish{needGlow}"), - ResourceType.Temple => Resources.Load($"ArtResources/TH1Buildings/TH1BuildingsCommon/TH1Building_Temple"), - ResourceType.ForestTemple => Resources.Load($"ArtResources/TH1Buildings/TH1BuildingsCommon/TH1Building_ForestTemple"), - ResourceType.MountainTemple => Resources.Load($"ArtResources/TH1Buildings/TH1BuildingsCommon/TH1Building_MountainTemple"), - ResourceType.WaterTemple => Resources.Load($"ArtResources/TH1Buildings/TH1BuildingsCommon/TH1Building_WaterTemple"), + ResourceType.Temple => Table.Instance.GridAndResourceDataAssets.GetResourceSprite(ResourceType.Temple,_playerData),//.Load($"ArtResources/TH1Buildings/TH1BuildingsCommon/TH1Building_Temple"), + ResourceType.ForestTemple => Table.Instance.GridAndResourceDataAssets.GetResourceSprite(ResourceType.ForestTemple,_playerData), + ResourceType.MountainTemple => Table.Instance.GridAndResourceDataAssets.GetResourceSprite(ResourceType.MountainTemple,_playerData), + ResourceType.WaterTemple => Table.Instance.GridAndResourceDataAssets.GetResourceSprite(ResourceType.WaterTemple,_playerData), ResourceType.Farm => Resources.Load( $"ArtResources/TH1Buildings/TH1BuildingsCommon/TH1Building_Farm"), ResourceType.Mine => Resources.Load( @@ -666,6 +706,50 @@ namespace TH1Renderer } + public void SetDieHintVFXAnim() + { + if (_fog.activeSelf) return; + if (_isPlayingDieHintVFX) return; + _playDieHintVFX = true; + } + + public void PlayDieHintVFX() + { + var VFX = _ROGrid.transform.Find("Effect/Die").gameObject; + VFX.SetActive(true); + var animancer = VFX.GetComponent(); + if (DieVFXAnim != null) + { + _isPlayingDieHintVFX = true; + Debug.Log("!!!!"); + animancer.Play(DieHintVFXAnim); + } + + } + + public void SetStopDieHintVFXAnim() + { + if (_fog.activeSelf) return; + if (!_isPlayingDieHintVFX) return; + _stopDieHintVFX = true; + } + + public void StopDieHintVFX() + { + var VFX = _ROGrid.transform.Find("Effect/Die").gameObject; + var animancer = VFX.GetComponent(); + if (DieVFXAnim != null) + { + _isPlayingDieHintVFX = false; + animancer.Stop(DieHintVFXAnim); + } + VFX.SetActive(false); + + } + + + + public void SetTreasureVFXAnim() { if (_fog.activeSelf) return; @@ -692,5 +776,31 @@ namespace TH1Renderer } + public void SetHealVFXAnim() + { + if (_fog.activeSelf) return; + if (_isPlayingHealVFX) return; + _playHealVFX = true; + } + + public void PlayHealVFX() + { + + var VFX = _ROGrid.transform.Find("Effect/Heal").gameObject; + VFX.SetActive(true); + var animancer = VFX.GetComponent(); + if (HealVFXAnim != null) + { + _isPlayingHealVFX = true; + animancer.Play(HealVFXAnim); + Timer.Instance.TimerRegister(VFX, () => + { + VFX.SetActive(false); + _isPlayingHealVFX = false; + }, HealVFXAnim.length); + + } + + } } } \ No newline at end of file diff --git a/My project/Assets/Scripts/TH1Renderer/MapRenderer.cs b/My project/Assets/Scripts/TH1Renderer/MapRenderer.cs index 89c42a727..108fe308a 100644 --- a/My project/Assets/Scripts/TH1Renderer/MapRenderer.cs +++ b/My project/Assets/Scripts/TH1Renderer/MapRenderer.cs @@ -106,6 +106,17 @@ namespace TH1Renderer public void Update() { + + //处理所有飞行道具。这个不会被暂停 + ProjectileManager.Update(); + + //如果有centerMessage ，停掉一切动画 + if (_main.UIManager.CenterMessageUI.isShowingNow) + { + return; + } + + // 处理临时探索者的浮动动画 if (_temporaryExplorerActive && _temporaryExplorer != null) { @@ -223,7 +234,7 @@ namespace TH1Renderer //-------- 处理子节点的Update -------// - ProjectileManager.Update(); + foreach (var roUnit in ROUnitMap.Values) { @@ -247,7 +258,10 @@ namespace TH1Renderer public void RenderUpdateGridMap() { foreach (var gridData in _main.MapData.GridMap.GridList) - ROGridMap[gridData.Id] = new GridRenderer(_gridPrefab,_gridRenderMap,gridData.Id,_main.MapData,_main); + { + ROGridMap[gridData.Id] = + new GridRenderer(_gridPrefab, _gridRenderMap, gridData.Id, _main.MapData, _main); + } } //当cityMap出现新的对象时，新建对象 @@ -325,6 +339,7 @@ namespace TH1Renderer //如果是攻击目标，且unit的AP>0 if (sig == MoveAttackType.Attack && unitData.AP > 0) { + targetGridData.VFXRenderMarkDieHintStart = true; _main.MapData.GetUnitDataByGid(targetGridData.Id, out var unitDataB); ROUnitMap[unitDataB.Id].SetAttackHighlight(true); } diff --git a/My project/Assets/Scripts/TH1Renderer/ProjectileRenderer.cs b/My project/Assets/Scripts/TH1Renderer/ProjectileRenderer.cs index 6885460ad..4438ca851 100644 --- a/My project/Assets/Scripts/TH1Renderer/ProjectileRenderer.cs +++ b/My project/Assets/Scripts/TH1Renderer/ProjectileRenderer.cs @@ -95,23 +95,25 @@ namespace TH1Renderer //如果是coin 完全单独处理 if (_projectileData.ProjectileMoveType == ProjectileMoveType.CoinParabola) { - var middlePos = moveStartPos; - middlePos.x -= 5; - middlePos.y -= 5; + var startPos = moveStartPos; + startPos.y -= 5f; + var middlePos = startPos; + + middlePos.y -= 2f; // 增加时间 moveTime += Time.deltaTime / moveFullTime; - - //前30%的时间轻微移动 - if (moveTime < 0.3) + float showTime = 0.3f; + //前showTime%的时间轻微移动 + if (moveTime < showTime) { - t = Mathf.Clamp01(moveTime/0.3f); + t = Mathf.Clamp01(moveTime/showTime); // 计算水平线性插值位置 - linearPos = Vector3.Lerp(moveStartPos, middlePos, t); + linearPos = Vector3.Lerp(startPos, middlePos, t); // 添加抛物线效果 (在y轴方向) // 使用sin函数创建一个弧形，在中间点达到最高 - arcHeight = Vector3.Distance(moveStartPos, moveEndPos) * parabola_height; // 弧高为距离的20% + arcHeight = Vector3.Distance(startPos, middlePos) * parabola_height; // 弧高为距离的20% arcOffset = Mathf.Sin(t * Mathf.PI) * arcHeight; // 最终位置 = 线性插值位置 + 抛物线高度偏移 @@ -128,7 +130,7 @@ namespace TH1Renderer else { // 计算当前位置的插值因子 (0到1之间) - t = Mathf.Clamp01((moveTime - 0.3f) / 0.7f); + t = Mathf.Clamp01((moveTime - showTime) / (1f - showTime)); // 计算水平线性插值位置 linearPos = Vector3.Lerp(middlePos, moveEndPos, t); diff --git a/My project/Assets/Scripts/TH1Renderer/UnitRenderer.cs b/My project/Assets/Scripts/TH1Renderer/UnitRenderer.cs index e97d4cc8b..c57e66244 100644 --- a/My project/Assets/Scripts/TH1Renderer/UnitRenderer.cs +++ b/My project/Assets/Scripts/TH1Renderer/UnitRenderer.cs @@ -43,6 +43,7 @@ namespace TH1Renderer //------bounce相关参数-------- bool _needBounce = false, _isBounceDown = true; Vector3 bounceUpPos, bounceDownPos; + private float _bounceWaitTime = 0f; float bounceTime = 0f; float bounceDownFullTime = 0.05f; float bounceUpFullTime = 0.1f; @@ -176,7 +177,8 @@ namespace TH1Renderer if (_unitData.BounceRenderMark) { _unitData.BounceRenderMark = false; - SetBounceAnim(); + SetBounceAnim(_unitData.BounceRenderMakrWaitTime); + _unitData.BounceRenderMakrWaitTime = 0f; } if (_unitData.RenderMark) { @@ -228,6 +230,10 @@ namespace TH1Renderer if (_needBounce) { + if (_bounceWaitTime > 0){ + _bounceWaitTime -= Time.deltaTime; + } + else if (_isBounceDown) { bounceTime += Time.deltaTime / bounceDownFullTime; @@ -618,9 +624,10 @@ namespace TH1Renderer } - public void SetBounceAnim() + public void SetBounceAnim(float waitTime = 0f) { if (_needBounce) return; + _bounceWaitTime = waitTime; _needBounce = true; _isBounceDown = true; bounceTime = 0f; diff --git a/My project/Assets/Scripts/UI/BottomInfoUI.cs b/My project/Assets/Scripts/UI/BottomInfoUI.cs index 5d472ab66..956dd5389 100644 --- a/My project/Assets/Scripts/UI/BottomInfoUI.cs +++ b/My project/Assets/Scripts/UI/BottomInfoUI.cs @@ -79,9 +79,9 @@ public class BottomInfoUI// : MonoBehaviour _skillInfo = ROBottomInfoUI.transform.Find("InfoGroup/SkillInfo").gameObject; _closeButton = ROBottomInfoUI.transform.Find("CloseButton").gameObject; // 收起按钮 _hintWindow = ROBottomInfoUI.transform.Find("HintWindow").gameObject; - _debugGrid = ROBottomInfoUI.transform.Find("DebugGrid").gameObject; - _debugUnit = ROBottomInfoUI.transform.Find("DebugUnit").gameObject; - _debugCity = ROBottomInfoUI.transform.Find("DebugCity").gameObject; + _debugGrid = _main.UIManager.ROUIManager.transform.Find("DebugPanel/PanelGroup/Selected/DebugGrid").gameObject; + _debugUnit = _main.UIManager.ROUIManager.transform.Find("DebugPanel/PanelGroup/Selected/DebugUnit").gameObject; + _debugCity = _main.UIManager.ROUIManager.transform.Find("DebugPanel/PanelGroup/Selected/DebugCity").gameObject; _unitTitle = ROBottomInfoUI.transform.Find("InfoGroup/UnitBaseInfo/Title").gameObject; _gridTitle = ROBottomInfoUI.transform.Find("InfoGroup/GridBaseInfo/Title").gameObject; _cityTitle = ROBottomInfoUI.transform.Find("InfoGroup/CityBaseInfo/Title").gameObject; @@ -638,13 +638,9 @@ public class BottomInfoUI// : MonoBehaviour public void UpdateDebugInfo() { if (!DebugCenter.Instance.DebugMode) - { - _debugGrid.SetActive(false); - _debugUnit.SetActive(false); - _debugCity.SetActive(false); return; - } - + if (_mapData == null) + return; //如果是城市格子 if (UIBottomInfoIsGrid && _mapData.GetCityDataByGid(UIBottomInfoStatusObjectId,out var city)) { @@ -659,19 +655,20 @@ public class BottomInfoUI// : MonoBehaviour _debugGrid.SetActive(true); _debugUnit.SetActive(false); _debugCity.SetActive(false); - _main.MapData.GridMap.GetGridDataByGid(UIBottomInfoStatusObjectId,out var gridData); + if (!_main.MapData.GridMap.GetGridDataByGid(UIBottomInfoStatusObjectId, out var gridData)) + return; _debugGrid.transform.Find("BuildingLevelValue").GetComponent().text = gridData.buildingLevel.ToString(); } //如果是unit - else - { + else{ _debugGrid.SetActive(false); _debugUnit.SetActive(true); _debugCity.SetActive(false); // 获取单位数据 - _main.MapData.UnitMap.GetUnitDataByUnitId(UIBottomInfoStatusObjectId, out var unitData); + if (!_main.MapData.UnitMap.GetUnitDataByUnitId(UIBottomInfoStatusObjectId, out var unitData)) + return; // 填充单位类型信息 _debugUnit.transform.Find("UnitTypeValue").GetComponent().text = unitData.UnitType.ToString(); diff --git a/My project/Assets/Scripts/UI/DebugUI.cs b/My project/Assets/Scripts/UI/DebugUI.cs new file mode 100644 index 000000000..20b5ffe79 --- /dev/null +++ b/My project/Assets/Scripts/UI/DebugUI.cs @@ -0,0 +1,136 @@ +using System.Collections.Generic; +using UnityEngine; +using UnityEngine.UI; +using Logic; +using RuntimeData; +using TMPro; +public class DebugUI +{ + private Main _main; + private MapData _mapData; + public GameObject RODebugUI; + + private GameObject buttonGroup; + private GameObject panelGroup; + + private Dictionary panelDict; + + public bool NeedShow = false; + + public DebugUI(Main main, MapData mapData) + { + _main = main; + _mapData = mapData; + + Transform root = _main.UIManager.ROUIManager.transform; + Transform panelRoot = root.Find("DebugPanel"); + if (panelRoot == null) return; + + RODebugUI = panelRoot.gameObject; + + Button startButton = panelRoot.Find("ButtonStart")?.GetComponent