diff --git a/client/client/Assets/RawResources/Character/Play/Master006/Master_006.prefab b/client/client/Assets/RawResources/Character/Play/Master006/Master_006.prefab index 48bf2cb9..cfca2e8b 100644 --- a/client/client/Assets/RawResources/Character/Play/Master006/Master_006.prefab +++ b/client/client/Assets/RawResources/Character/Play/Master006/Master_006.prefab @@ -704,8 +704,8 @@ MonoBehaviour: byteData: byteDataArray: Version: 1.7.4 - gizmoViewMode: 0 - showBehaviorDesignerGizmo: 0 + gizmoViewMode: 2 + showBehaviorDesignerGizmo: 1 --- !u!114 &8031103349482593517 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1561,7 +1561,7 @@ Transform: serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 3, y: 3, z: 3} + m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 1 m_Children: [] m_Father: {fileID: 7117816414799325755} diff --git a/client/client/Assets/RawResources/Character/Play/Master007/Master_007.prefab b/client/client/Assets/RawResources/Character/Play/Master007/Master_007.prefab index d20382a1..7e920fa2 100644 --- a/client/client/Assets/RawResources/Character/Play/Master007/Master_007.prefab +++ b/client/client/Assets/RawResources/Character/Play/Master007/Master_007.prefab @@ -511,8 +511,8 @@ MonoBehaviour: byteData: byteDataArray: Version: 1.7.4 - gizmoViewMode: 0 - showBehaviorDesignerGizmo: 0 + gizmoViewMode: 2 + showBehaviorDesignerGizmo: 1 --- !u!114 &8031103349482593517 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1476,8 +1476,8 @@ Transform: serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 2.173913, y: 2.173913, z: 1} - m_ConstrainProportionsScale: 0 + m_LocalScale: {x: 1, y: 1, z: 0.46} + m_ConstrainProportionsScale: 1 m_Children: [] m_Father: {fileID: 7117816414799325755} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -1522,7 +1522,7 @@ SpriteRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_Sprite: {fileID: 21300000, guid: 7bf3bbf60736c744bbb74e857aeeb4c2, type: 3} + m_Sprite: {fileID: 21300000, guid: 4b4f2c3078a1e8b49b7f1c7ea2800311, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 m_FlipY: 0 diff --git a/client/client/Assets/Scenes/BattleEditor.unity b/client/client/Assets/Scenes/BattleEditor.unity index 02144c8d..ef1d70d4 100644 --- a/client/client/Assets/Scenes/BattleEditor.unity +++ b/client/client/Assets/Scenes/BattleEditor.unity @@ -358,7 +358,7 @@ SpriteRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_Sprite: {fileID: -5177388603050735206, guid: 8884154dfe85442a3a3578be807dbcdf, type: 3} - m_Color: {r: 0, g: 0, b: 0, a: 1} + m_Color: {r: 0.21698111, g: 0.21698111, b: 0.21698111, a: 1} m_FlipX: 0 m_FlipY: 0 m_DrawMode: 2 @@ -769,6 +769,185 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 490428946} m_CullTransparentMesh: 1 +--- !u!1 &536237622 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 536237623} + - component: {fileID: 536237624} + - component: {fileID: 536237625} + m_Layer: 5 + m_Name: Slider + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &536237623 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 536237622} + 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: 914161520} + - {fileID: 1820615747} + - {fileID: 868441115} + m_Father: {fileID: 1291515644} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 66, y: 44} + m_SizeDelta: {x: 40, y: 321.17} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &536237624 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 536237622} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 67db9e8f0e2ae9c40bc1e2b64352a6b4, 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: 1229089819} + m_FillRect: {fileID: 585093706} + m_HandleRect: {fileID: 1229089818} + m_Direction: 3 + m_MinValue: 0 + m_MaxValue: 1 + m_WholeNumbers: 0 + m_Value: 0.5 + m_OnValueChanged: + m_PersistentCalls: + m_Calls: [] +--- !u!114 &536237625 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 536237622} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0934ec5964bf495da5cb0f0b2d98c233, type: 3} + m_Name: + m_EditorClassIdentifier: + sliderX: {fileID: 536237624} +--- !u!1 &585093705 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 585093706} + - component: {fileID: 585093708} + - component: {fileID: 585093707} + m_Layer: 5 + m_Name: Fill + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &585093706 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 585093705} + 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: 1820615747} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 10} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &585093707 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 585093705} + 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 &585093708 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 585093705} + m_CullTransparentMesh: 1 --- !u!1 &588709065 GameObject: m_ObjectHideFlags: 0 @@ -843,7 +1022,7 @@ SpriteRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_Sprite: {fileID: -5177388603050735206, guid: 8884154dfe85442a3a3578be807dbcdf, type: 3} - m_Color: {r: 0, g: 0, b: 0, a: 1} + m_Color: {r: 0.21698111, g: 0.21698111, b: 0.21698111, a: 1} m_FlipX: 0 m_FlipY: 0 m_DrawMode: 2 @@ -1060,7 +1239,7 @@ SpriteRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_Sprite: {fileID: -5177388603050735206, guid: 8884154dfe85442a3a3578be807dbcdf, type: 3} - m_Color: {r: 0, g: 0, b: 0, a: 1} + m_Color: {r: 0.21698111, g: 0.21698111, b: 0.21698111, a: 1} m_FlipX: 0 m_FlipY: 0 m_DrawMode: 2 @@ -1085,7 +1264,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!4 &839548526 Transform: m_ObjectHideFlags: 0 @@ -1095,7 +1274,7 @@ Transform: m_GameObject: {fileID: 839548525} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -1.6381831, y: -2.7237954, z: 12.453167} + m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: @@ -1105,6 +1284,117 @@ Transform: - {fileID: 588709066} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &868441114 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 868441115} + m_Layer: 5 + m_Name: Handle Slide Area + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &868441115 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 868441114} + 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: 1229089818} + m_Father: {fileID: 536237623} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: -20} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &914161519 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 914161520} + - component: {fileID: 914161522} + - component: {fileID: 914161521} + m_Layer: 5 + m_Name: Background + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &914161520 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 914161519} + 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: 536237623} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.25, y: 0} + m_AnchorMax: {x: 0.75, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &914161521 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 914161519} + 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 &914161522 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 914161519} + m_CullTransparentMesh: 1 --- !u!1 &917061369 GameObject: m_ObjectHideFlags: 0 @@ -1456,7 +1746,7 @@ Camera: far clip plane: 1000 field of view: 60 orthographic: 1 - orthographic size: 9 + orthographic size: 10.5 m_Depth: 0 m_CullingMask: serializedVersion: 2 @@ -1767,6 +2057,81 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] +--- !u!1 &1229089817 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1229089818} + - component: {fileID: 1229089820} + - component: {fileID: 1229089819} + m_Layer: 5 + m_Name: Handle + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1229089818 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1229089817} + 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: 868441115} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 40} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1229089819 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1229089817} + 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: 10913, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &1229089820 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1229089817} + m_CullTransparentMesh: 1 --- !u!1 &1291515643 GameObject: m_ObjectHideFlags: 0 @@ -1797,6 +2162,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1216032344} + - {fileID: 536237623} m_Father: {fileID: 1433238611} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} @@ -1956,7 +2322,7 @@ SpriteRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_Sprite: {fileID: -5177388603050735206, guid: 8884154dfe85442a3a3578be807dbcdf, type: 3} - m_Color: {r: 0, g: 0, b: 0, a: 1} + m_Color: {r: 0.21698111, g: 0.21698111, b: 0.21698111, a: 1} m_FlipX: 0 m_FlipY: 0 m_DrawMode: 2 @@ -2626,6 +2992,42 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1789904000} m_CullTransparentMesh: 1 +--- !u!1 &1820615746 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1820615747} + m_Layer: 5 + m_Name: Fill Area + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1820615747 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1820615746} + 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: 585093706} + m_Father: {fileID: 536237623} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.25, y: 0} + m_AnchorMax: {x: 0.75, y: 1} + m_AnchoredPosition: {x: 0, y: 5} + m_SizeDelta: {x: 0, y: -20} + m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &1921453497 GameObject: m_ObjectHideFlags: 0 diff --git a/client/client/Assets/Scripts/CoreGame/AFramSync/Logic/Component/Ball/BallBagComponent.cs b/client/client/Assets/Scripts/CoreGame/AFramSync/Logic/Component/Ball/BallBagComponent.cs index 9ac92623..941e558d 100644 --- a/client/client/Assets/Scripts/CoreGame/AFramSync/Logic/Component/Ball/BallBagComponent.cs +++ b/client/client/Assets/Scripts/CoreGame/AFramSync/Logic/Component/Ball/BallBagComponent.cs @@ -17,6 +17,7 @@ namespace CoreGame.Logic public class BallBagComponent : IComponent { public Fixed64 shootSpeed; + public Fixed64Vector2 shootDir; [Inner] public Fixed64 timeAcc; [Inner] diff --git a/client/client/Assets/Scripts/CoreGame/AFramSync/Logic/EntitasGen/Components/LogicBallBagComponent.cs b/client/client/Assets/Scripts/CoreGame/AFramSync/Logic/EntitasGen/Components/LogicBallBagComponent.cs index b5bc8247..85ca0945 100644 --- a/client/client/Assets/Scripts/CoreGame/AFramSync/Logic/EntitasGen/Components/LogicBallBagComponent.cs +++ b/client/client/Assets/Scripts/CoreGame/AFramSync/Logic/EntitasGen/Components/LogicBallBagComponent.cs @@ -11,17 +11,19 @@ public partial class LogicEntity { public CoreGame.Logic.BallBagComponent ballBag { get { return (CoreGame.Logic.BallBagComponent)GetComponent(LogicComponentsLookup.BallBag); } } public bool hasBallBag { get { return HasComponent(LogicComponentsLookup.BallBag); } } - public void AddBallBag(Sog.Fixed64 newShootSpeed) { + public void AddBallBag(Sog.Fixed64 newShootSpeed, Sog.Fixed64Vector2 newShootDir) { var index = LogicComponentsLookup.BallBag; var component = (CoreGame.Logic.BallBagComponent)CreateComponent(index, typeof(CoreGame.Logic.BallBagComponent)); component.shootSpeed = newShootSpeed; + component.shootDir = newShootDir; AddComponent(index, component); } - public void ReplaceBallBag(Sog.Fixed64 newShootSpeed) { + public void ReplaceBallBag(Sog.Fixed64 newShootSpeed, Sog.Fixed64Vector2 newShootDir) { var index = LogicComponentsLookup.BallBag; var component = (CoreGame.Logic.BallBagComponent)CreateComponent(index, typeof(CoreGame.Logic.BallBagComponent)); component.shootSpeed = newShootSpeed; + component.shootDir = newShootDir; ReplaceComponent(index, component); } diff --git a/client/client/Assets/Scripts/CoreGame/AFramSync/Logic/FrameCommand/Desc/ChangeShootDirDesc.cs b/client/client/Assets/Scripts/CoreGame/AFramSync/Logic/FrameCommand/Desc/ChangeShootDirDesc.cs new file mode 100644 index 00000000..702893b4 --- /dev/null +++ b/client/client/Assets/Scripts/CoreGame/AFramSync/Logic/FrameCommand/Desc/ChangeShootDirDesc.cs @@ -0,0 +1,28 @@ +using CoreGame.Shared; +using Entitas; +using Sog; + +namespace CoreGame.Logic +{ + public class ChangeShootDirDesc : ICommandLogicDesc + { + public void OnExecute(ref BaseCommand command, LogicContext context, in EntityHandle entityHandle) + { + var changeShootDirCommand = (ChangeShootDirCmd)command; + if (entityHandle == false) + { + LLog.LogInfo($"ChangeShootDirDesc entityHandle is null {entityHandle}"); + return; + } + + var ballBagComponent = entityHandle.value.ballBag; + if (ballBagComponent == null) + { + LLog.LogInfo($"ChangeShootDirDesc ballBagComponent is null {ballBagComponent}"); + return; + } + + ballBagComponent.shootDir = GameUtils.FacingToVec2(changeShootDirCommand.Degree); + } + } +} \ No newline at end of file diff --git a/client/client/Assets/Scripts/CoreGame/AFramSync/Logic/FrameCommand/Desc/ChangeShootDirDesc.cs.meta b/client/client/Assets/Scripts/CoreGame/AFramSync/Logic/FrameCommand/Desc/ChangeShootDirDesc.cs.meta new file mode 100644 index 00000000..47d4b84b --- /dev/null +++ b/client/client/Assets/Scripts/CoreGame/AFramSync/Logic/FrameCommand/Desc/ChangeShootDirDesc.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 47ec4837f95342e09ed5d29e5c82bec0 +timeCreated: 1753449139 \ No newline at end of file diff --git a/client/client/Assets/Scripts/CoreGame/AFramSync/Logic/FrameCommand/Desc/MoveDirectionDesc.cs b/client/client/Assets/Scripts/CoreGame/AFramSync/Logic/FrameCommand/Desc/MoveDirectionDesc.cs index 8eac1a34..5004d851 100644 --- a/client/client/Assets/Scripts/CoreGame/AFramSync/Logic/FrameCommand/Desc/MoveDirectionDesc.cs +++ b/client/client/Assets/Scripts/CoreGame/AFramSync/Logic/FrameCommand/Desc/MoveDirectionDesc.cs @@ -7,7 +7,7 @@ namespace CoreGame.Logic { public void OnExecute(ref BaseCommand command, LogicContext context, in EntityHandle entityHandle) { - var moveDirectionCommand = (MoveDirectionCommand)command; + var moveDirectionCommand = (MoveDirectionCmd)command; if (entityHandle == false) { LLog.LogInfo($"MoveDirectionDesc entityHandle is null {entityHandle}"); diff --git a/client/client/Assets/Scripts/CoreGame/AFramSync/Logic/FrameCommand/LogicCommandSvc.cs b/client/client/Assets/Scripts/CoreGame/AFramSync/Logic/FrameCommand/LogicCommandSvc.cs index 1f961ec5..e20de01c 100644 --- a/client/client/Assets/Scripts/CoreGame/AFramSync/Logic/FrameCommand/LogicCommandSvc.cs +++ b/client/client/Assets/Scripts/CoreGame/AFramSync/Logic/FrameCommand/LogicCommandSvc.cs @@ -14,6 +14,7 @@ namespace CoreGame.Logic { s_LogicContext = context; s_LogicCommandDescs[(int)FrameCmdDef.MoveDir] = new MoveDirectionDesc(); + s_LogicCommandDescs[(int)FrameCmdDef.ChangeShootDir] = new ChangeShootDirDesc(); } public static void UnInit() diff --git a/client/client/Assets/Scripts/CoreGame/AFramSync/Logic/Service/LEntityCreatorSvc.cs b/client/client/Assets/Scripts/CoreGame/AFramSync/Logic/Service/LEntityCreatorSvc.cs index 9dc9279c..685318d5 100644 --- a/client/client/Assets/Scripts/CoreGame/AFramSync/Logic/Service/LEntityCreatorSvc.cs +++ b/client/client/Assets/Scripts/CoreGame/AFramSync/Logic/Service/LEntityCreatorSvc.cs @@ -45,7 +45,7 @@ namespace CoreGame.Logic ce.AddProperty(); ce.property.SetProperty(PropertyDef.SpeedFixedIncrease, 20, true); - ce.AddBallBag(Fixed64._0_10); + ce.AddBallBag(Fixed64._0_10, Fixed64Vector2.up); BallSvc.FillBall(ce); ce.isShootBall = true; diff --git a/client/client/Assets/Scripts/CoreGame/AFramSync/Logic/System/Ball/ShootBall/ThrowBallSystem.cs b/client/client/Assets/Scripts/CoreGame/AFramSync/Logic/System/Ball/ShootBall/ThrowBallSystem.cs index 30efb936..97bb9b7a 100644 --- a/client/client/Assets/Scripts/CoreGame/AFramSync/Logic/System/Ball/ShootBall/ThrowBallSystem.cs +++ b/client/client/Assets/Scripts/CoreGame/AFramSync/Logic/System/Ball/ShootBall/ThrowBallSystem.cs @@ -34,18 +34,18 @@ namespace CoreGame.Logic var ballInfo = bagComp.willShootBalls.Dequeue(); var logicTransform = entity.logicTransform; - Fixed64Vector2 dir = Fixed64Vector2.up; - if (logicTransform.position.y < -1) - { - dir = Fixed64Vector2.zero - logicTransform.position; - dir.Normalize(); - } - else - { - dir = FixedRandom.instance.NextDirection2D(); - } - - LEntityCreatorSvc.CreateBallEntity(entity, logicTransform.position, dir, ballInfo); + // Fixed64Vector2 dir = Fixed64Vector2.up; + // if (logicTransform.position.y < -1) + // { + // dir = Fixed64Vector2.zero - logicTransform.position; + // dir.Normalize(); + // } + // else + // { + // dir = FixedRandom.instance.NextDirection2D(); + // } + // + LEntityCreatorSvc.CreateBallEntity(entity, logicTransform.position, bagComp.shootDir, ballInfo); } } } diff --git a/client/client/Assets/Scripts/CoreGame/AFramSync/Logic/System/Motion/MoveLogicSystem.cs b/client/client/Assets/Scripts/CoreGame/AFramSync/Logic/System/Motion/MoveLogicSystem.cs index 5e2afcff..83a960b0 100644 --- a/client/client/Assets/Scripts/CoreGame/AFramSync/Logic/System/Motion/MoveLogicSystem.cs +++ b/client/client/Assets/Scripts/CoreGame/AFramSync/Logic/System/Motion/MoveLogicSystem.cs @@ -37,6 +37,7 @@ namespace CoreGame.Logic logicTransform.forward = GameUtils.FacingToVec2(moveDirectionCommand.degree); var pos = logicTransform.position + logicTransform.forward * (propertyComponent.MoveSpeed * LogicTime.DeltaM); var size = m_LogicContext.WorldExtendSize; + size -= Fixed64Vector2.one * Fixed64._0_50; if (pos.x < -size.x || pos.x > size.x || pos.y < -size.y || pos.y > size.y) { diff --git a/client/client/Assets/Scripts/CoreGame/AFramSync/Render/Component/Proxy/ShootDirComponent.cs b/client/client/Assets/Scripts/CoreGame/AFramSync/Render/Component/Proxy/ShootDirComponent.cs new file mode 100644 index 00000000..a8411b3c --- /dev/null +++ b/client/client/Assets/Scripts/CoreGame/AFramSync/Render/Component/Proxy/ShootDirComponent.cs @@ -0,0 +1,10 @@ +using Entitas; + +namespace CoreGame.Render +{ + [Render] + public class ShootDirComponent : IComponent + { + public float value; + } +} \ No newline at end of file diff --git a/client/client/Assets/Scripts/CoreGame/AFramSync/Render/Component/Proxy/ShootDirComponent.cs.meta b/client/client/Assets/Scripts/CoreGame/AFramSync/Render/Component/Proxy/ShootDirComponent.cs.meta new file mode 100644 index 00000000..f0a8f19d --- /dev/null +++ b/client/client/Assets/Scripts/CoreGame/AFramSync/Render/Component/Proxy/ShootDirComponent.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 5eb9628fba794f35973f9e208e34ca85 +timeCreated: 1753448171 \ No newline at end of file diff --git a/client/client/Assets/Scripts/CoreGame/AFramSync/Render/EntitasGen/Components/RenderShootDirComponent.cs b/client/client/Assets/Scripts/CoreGame/AFramSync/Render/EntitasGen/Components/RenderShootDirComponent.cs new file mode 100644 index 00000000..3c1a0dca --- /dev/null +++ b/client/client/Assets/Scripts/CoreGame/AFramSync/Render/EntitasGen/Components/RenderShootDirComponent.cs @@ -0,0 +1,56 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by Entitas.CodeGeneration.Plugins.ComponentEntityApiGenerator. +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ +public partial class RenderEntity { + + public CoreGame.Render.ShootDirComponent shootDir { get { return (CoreGame.Render.ShootDirComponent)GetComponent(RenderComponentsLookup.ShootDir); } } + public bool hasShootDir { get { return HasComponent(RenderComponentsLookup.ShootDir); } } + + public void AddShootDir(float newValue) { + var index = RenderComponentsLookup.ShootDir; + var component = (CoreGame.Render.ShootDirComponent)CreateComponent(index, typeof(CoreGame.Render.ShootDirComponent)); + component.value = newValue; + AddComponent(index, component); + } + + public void ReplaceShootDir(float newValue) { + var index = RenderComponentsLookup.ShootDir; + var component = (CoreGame.Render.ShootDirComponent)CreateComponent(index, typeof(CoreGame.Render.ShootDirComponent)); + component.value = newValue; + ReplaceComponent(index, component); + } + + public void RemoveShootDir() { + RemoveComponent(RenderComponentsLookup.ShootDir); + } +} + +//------------------------------------------------------------------------------ +// +// This code was generated by Entitas.CodeGeneration.Plugins.ComponentMatcherApiGenerator. +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ +public sealed partial class RenderMatcher { + + static Entitas.IMatcher _matcherShootDir; + + public static Entitas.IMatcher ShootDir { + get { + if (_matcherShootDir == null) { + var matcher = (Entitas.Matcher)Entitas.Matcher.AllOf(RenderComponentsLookup.ShootDir); + matcher.componentNames = RenderComponentsLookup.componentNames; + _matcherShootDir = matcher; + } + + return _matcherShootDir; + } + } +} diff --git a/client/client/Assets/Scripts/CoreGame/AFramSync/Render/EntitasGen/Components/RenderShootDirComponent.cs.meta b/client/client/Assets/Scripts/CoreGame/AFramSync/Render/EntitasGen/Components/RenderShootDirComponent.cs.meta new file mode 100644 index 00000000..8ef801ab --- /dev/null +++ b/client/client/Assets/Scripts/CoreGame/AFramSync/Render/EntitasGen/Components/RenderShootDirComponent.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 8c002d2d4ab305447810087f0b9b93e1 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/client/client/Assets/Scripts/CoreGame/AFramSync/Render/EntitasGen/RenderComponentsLookup.cs b/client/client/Assets/Scripts/CoreGame/AFramSync/Render/EntitasGen/RenderComponentsLookup.cs index 3fb745f6..9b62b549 100644 --- a/client/client/Assets/Scripts/CoreGame/AFramSync/Render/EntitasGen/RenderComponentsLookup.cs +++ b/client/client/Assets/Scripts/CoreGame/AFramSync/Render/EntitasGen/RenderComponentsLookup.cs @@ -16,18 +16,19 @@ public static class RenderComponentsLookup { public const int MonoCompsProxy = 5; public const int NeedLerp = 6; public const int Property = 7; - public const int StateData = 8; - public const int SvrPing = 9; - public const int TransformProxy = 10; - public const int VirtualCameraProxy = 11; - public const int Bullet = 12; - public const int Faction = 13; - public const int Hero = 14; - public const int Monster = 15; - public const int Summon = 16; - public const int SyncData = 17; + public const int ShootDir = 8; + public const int StateData = 9; + public const int SvrPing = 10; + public const int TransformProxy = 11; + public const int VirtualCameraProxy = 12; + public const int Bullet = 13; + public const int Faction = 14; + public const int Hero = 15; + public const int Monster = 16; + public const int Summon = 17; + public const int SyncData = 18; - public const int TotalComponents = 18; + public const int TotalComponents = 19; public static readonly string[] componentNames = { "AnimationProxy", @@ -38,6 +39,7 @@ public static class RenderComponentsLookup { "MonoCompsProxy", "NeedLerp", "Property", + "ShootDir", "StateData", "SvrPing", "TransformProxy", @@ -59,6 +61,7 @@ public static class RenderComponentsLookup { typeof(CoreGame.Render.MonoCompsProxy), typeof(CoreGame.Render.NeedLerpComponent), typeof(CoreGame.Render.PropertyComponent), + typeof(CoreGame.Render.ShootDirComponent), typeof(CoreGame.Render.StateDataComponent), typeof(CoreGame.Render.SvrPingComponent), typeof(CoreGame.Render.TransformProxy), diff --git a/client/client/Assets/Scripts/CoreGame/AFramSync/Render/Extends/Entitas/RenderContextExt.cs b/client/client/Assets/Scripts/CoreGame/AFramSync/Render/Extends/Entitas/RenderContextExt.cs index 1ad33a33..4edbd1bd 100644 --- a/client/client/Assets/Scripts/CoreGame/AFramSync/Render/Extends/Entitas/RenderContextExt.cs +++ b/client/client/Assets/Scripts/CoreGame/AFramSync/Render/Extends/Entitas/RenderContextExt.cs @@ -55,5 +55,8 @@ public partial class RenderContext #endif () => new RenderEntity() ) { + if (Instance == null) { + Instance = this; + } } } \ No newline at end of file diff --git a/client/client/Assets/Scripts/CoreGame/AFramSync/Render/FrameCommand/Desc/MoveDirectionDesc.cs b/client/client/Assets/Scripts/CoreGame/AFramSync/Render/FrameCommand/Desc/MoveDirectionDesc.cs index dcc2e2a7..e590500d 100644 --- a/client/client/Assets/Scripts/CoreGame/AFramSync/Render/FrameCommand/Desc/MoveDirectionDesc.cs +++ b/client/client/Assets/Scripts/CoreGame/AFramSync/Render/FrameCommand/Desc/MoveDirectionDesc.cs @@ -1,14 +1,13 @@ using CoreGame.Shared; using Entitas; using ProtoCSClass; -using MoveDirectionCommand = CoreGame.Shared.MoveDirectionCommand; namespace CoreGame.Render.Desc { [FrameCommandDescAttribute(FrameCmdDef.MoveDir)] - public class MoveDirectionRenderDesc : ICommandRenderDesc + public class MoveDirectionRenderDesc : ICommandRenderDesc { - public void Preprocess(ref MoveDirectionCommand command, RenderContext ctx, in EntityHandle entityHandle) + public void Preprocess(ref MoveDirectionCmd cmd, RenderContext ctx, in EntityHandle entityHandle) { RLog.LogInfoByEntity(entityHandle.value, "MoveDirectionRenderDesc Preprocess"); } diff --git a/client/client/Assets/Scripts/CoreGame/AFramSync/Render/FrameCommand/RenderCommandSvc.cs b/client/client/Assets/Scripts/CoreGame/AFramSync/Render/FrameCommand/RenderCommandSvc.cs index 45c0087c..001a8980 100644 --- a/client/client/Assets/Scripts/CoreGame/AFramSync/Render/FrameCommand/RenderCommandSvc.cs +++ b/client/client/Assets/Scripts/CoreGame/AFramSync/Render/FrameCommand/RenderCommandSvc.cs @@ -5,7 +5,6 @@ using CoreGame.Shared.Bridge; using Entitas; using Proto; using ProtoCSClass; -using MoveDirectionCommand = CoreGame.Shared.MoveDirectionCommand; namespace CoreGame.Render { @@ -21,7 +20,9 @@ namespace CoreGame.Render public static void Init() { - s_CommandCreator[(int)FrameCmdDef.MoveDir] = MoveDirectionCommand.Creator; + s_CommandCreator[(int)FrameCmdDef.MoveDir] = MoveDirectionCmd.Creator; + s_CommandCreator[(int)FrameCmdDef.ChangeShootDir] = ChangeShootDirCmd.Creator; + var assembly = typeof(BaseCommand).Assembly; diff --git a/client/client/Assets/Scripts/CoreGame/AFramSync/Render/Service/REntityCreatorSvc.cs b/client/client/Assets/Scripts/CoreGame/AFramSync/Render/Service/REntityCreatorSvc.cs index ed965ad1..d9b6336b 100644 --- a/client/client/Assets/Scripts/CoreGame/AFramSync/Render/Service/REntityCreatorSvc.cs +++ b/client/client/Assets/Scripts/CoreGame/AFramSync/Render/Service/REntityCreatorSvc.cs @@ -28,7 +28,8 @@ namespace CoreGame.Render parentNodeName = FNameConst.JoyStickParent, scaleParam = 1, }, null); - + + combatEntity.AddShootDir(90); s_RenderContext.SetInputEnt(combatEntity); return combatEntity; } diff --git a/client/client/Assets/Scripts/CoreGame/AFramSync/Render/System/Input/InputSystem.cs b/client/client/Assets/Scripts/CoreGame/AFramSync/Render/System/Input/InputSystem.cs index 7961902a..4fce755f 100644 --- a/client/client/Assets/Scripts/CoreGame/AFramSync/Render/System/Input/InputSystem.cs +++ b/client/client/Assets/Scripts/CoreGame/AFramSync/Render/System/Input/InputSystem.cs @@ -35,7 +35,7 @@ namespace CoreGame.Render.System var atan2 = Math.Atan2(combinePos.y, combinePos.x); var angle = atan2 * 180 / Math.PI; - var moveDirectionCommand = RenderCommandSvc.CreateFrameCommand(); + var moveDirectionCommand = RenderCommandSvc.CreateFrameCommand(); moveDirectionCommand.Degree = (short)angle; moveDirectionCommand.nSeq = m_InputSeq++; moveDirectionCommand.SendAndFree(localPlayerEntHandle); @@ -45,7 +45,7 @@ namespace CoreGame.Render.System { if (m_isMoving) { - var moveDirectionCommand = RenderCommandSvc.CreateFrameCommand(); + var moveDirectionCommand = RenderCommandSvc.CreateFrameCommand(); moveDirectionCommand.Degree = int.MaxValue; moveDirectionCommand.nSeq = m_InputSeq++; moveDirectionCommand.SendAndFree(localPlayerEntHandle); diff --git a/client/client/Assets/Scripts/CoreGame/AFramSync/Render/View/DirCtrlInput.cs b/client/client/Assets/Scripts/CoreGame/AFramSync/Render/View/DirCtrlInput.cs new file mode 100644 index 00000000..7a55d9d8 --- /dev/null +++ b/client/client/Assets/Scripts/CoreGame/AFramSync/Render/View/DirCtrlInput.cs @@ -0,0 +1,34 @@ +using System; +using CoreGame.Shared; +using UnityEngine; +using UnityEngine.UI; + +namespace CoreGame.Render +{ + public class DirCtrlInput : MonoBehaviour + { + public Slider sliderX; + + private void Start() + { + sliderX.onValueChanged.AddListener(OnValueChanged); + } + + private void OnValueChanged(float value) + { + var instance = RenderContext.Instance; + if (instance != null) + { + var localPlayer = instance.LocalPlayerEntHandle; + if (localPlayer) + { + var f = 10 + (1 - value) * 160; + + var moveDirectionCommand = RenderCommandSvc.CreateFrameCommand(); + moveDirectionCommand.Degree = (short)f; + moveDirectionCommand.SendAndFree(localPlayer); + } + } + } + } +} \ No newline at end of file diff --git a/client/client/Assets/Scripts/CoreGame/AFramSync/Render/View/DirCtrlInput.cs.meta b/client/client/Assets/Scripts/CoreGame/AFramSync/Render/View/DirCtrlInput.cs.meta new file mode 100644 index 00000000..94148240 --- /dev/null +++ b/client/client/Assets/Scripts/CoreGame/AFramSync/Render/View/DirCtrlInput.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 0934ec5964bf495da5cb0f0b2d98c233 +timeCreated: 1753447819 \ No newline at end of file diff --git a/client/client/Assets/Scripts/CoreGame/AFramSync/Shared/FrameCommand/Data/ChangeShootDirCmd.cs b/client/client/Assets/Scripts/CoreGame/AFramSync/Shared/FrameCommand/Data/ChangeShootDirCmd.cs new file mode 100644 index 00000000..a3b3f372 --- /dev/null +++ b/client/client/Assets/Scripts/CoreGame/AFramSync/Shared/FrameCommand/Data/ChangeShootDirCmd.cs @@ -0,0 +1,30 @@ +using AOT; +using ProtoCSClass; + +namespace CoreGame.Shared +{ + [FrameCommandClass(FrameCmdDef.ChangeShootDir)] + public class ChangeShootDirCmd : BaseCommand, ISptPool + { + public int Degree; + public int Seq; + + public static BaseCommand Creator(ref CSPlayerOpInfo msg) + { + ChangeShootDirCmd frameCmd = null; + SptPool.Malloc(ref frameCmd); + frameCmd.Degree = msg.ChangeDir.Degree; + frameCmd.Seq = msg.ChangeDir.Seq; + return frameCmd; + } + protected override void ToProtocol2(ref CSPlayerOpInfo msg) + { + msg.ChangeDir.Degree = Degree; + msg.ChangeDir.Seq = Seq; + } + + public void Reset() + { + } + } +} \ No newline at end of file diff --git a/client/client/Assets/Scripts/CoreGame/AFramSync/Shared/FrameCommand/Data/ChangeShootDirCmd.cs.meta b/client/client/Assets/Scripts/CoreGame/AFramSync/Shared/FrameCommand/Data/ChangeShootDirCmd.cs.meta new file mode 100644 index 00000000..e78067a6 --- /dev/null +++ b/client/client/Assets/Scripts/CoreGame/AFramSync/Shared/FrameCommand/Data/ChangeShootDirCmd.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 9ee32279a9044ef989924598bf4a1fed +timeCreated: 1753448587 \ No newline at end of file diff --git a/client/client/Assets/Scripts/CoreGame/AFramSync/Shared/FrameCommand/Data/MoveDirectionCommand.cs b/client/client/Assets/Scripts/CoreGame/AFramSync/Shared/FrameCommand/Data/MoveDirectionCmd.cs similarity index 67% rename from client/client/Assets/Scripts/CoreGame/AFramSync/Shared/FrameCommand/Data/MoveDirectionCommand.cs rename to client/client/Assets/Scripts/CoreGame/AFramSync/Shared/FrameCommand/Data/MoveDirectionCmd.cs index 4a905076..e0230dbe 100644 --- a/client/client/Assets/Scripts/CoreGame/AFramSync/Shared/FrameCommand/Data/MoveDirectionCommand.cs +++ b/client/client/Assets/Scripts/CoreGame/AFramSync/Shared/FrameCommand/Data/MoveDirectionCmd.cs @@ -4,18 +4,18 @@ using ProtoCSClass; namespace CoreGame.Shared { [FrameCommandClass(FrameCmdDef.MoveDir)] - public class MoveDirectionCommand : BaseCommand, ISptPool + public class MoveDirectionCmd : BaseCommand, ISptPool { public int Degree; public int nSeq; public static BaseCommand Creator(ref CSPlayerOpInfo msg) { - MoveDirectionCommand frameCommand = null; - SptPool.Malloc(ref frameCommand); - frameCommand.Degree = msg.Move.Degree; - frameCommand.nSeq = msg.Move.Seq; - return frameCommand; + MoveDirectionCmd frameCmd = null; + SptPool.Malloc(ref frameCmd); + frameCmd.Degree = msg.Move.Degree; + frameCmd.nSeq = msg.Move.Seq; + return frameCmd; } protected override void ToProtocol2(ref CSPlayerOpInfo msg) { diff --git a/client/client/Assets/Scripts/CoreGame/AFramSync/Shared/FrameCommand/Data/MoveDirectionCommand.cs.meta b/client/client/Assets/Scripts/CoreGame/AFramSync/Shared/FrameCommand/Data/MoveDirectionCmd.cs.meta similarity index 100% rename from client/client/Assets/Scripts/CoreGame/AFramSync/Shared/FrameCommand/Data/MoveDirectionCommand.cs.meta rename to client/client/Assets/Scripts/CoreGame/AFramSync/Shared/FrameCommand/Data/MoveDirectionCmd.cs.meta