增加手势

FastMail/Assets/0A2_Scripts/Battle/UI/BattleUI.cs

@@ -27,6 +27,7 @@ public class BattleUI : MonoBehaviour
     public Text m_cameraPosY;
     public Text m_cameraFieldView;
     public GameObject m_battleObj;//战斗UI
+    public GameObject m_mouseObj;//手势UI
     public Action onStartBtn;
     public Action onPosUpBtn;
     public Action onPosDownBtn;
@@ -180,4 +181,13 @@ public class BattleUI : MonoBehaviour
     {
         m_battleObj.SetActive(bool_);
     }
+    //设置手势位置
+    public void SetMousePos(float x,float y)
+    {
+        m_mouseObj.SetActive(x != 0 || y != 0);
+        Vector2 varVec2 = m_mouseObj.transform.localPosition;
+        varVec2.x = x;
+        varVec2.y = y;
+        m_mouseObj.transform.localPosition = varVec2;
+    }
 }

FastMail/Assets/0A2_Scripts/Battle/View/ChainRopeView.cs

@@ -103,7 +103,7 @@ public class ChainRopeView : MonoBehaviour
     {
         GameServices.inputService.pad.onMoveVec3 += OnMove;
         GameServices.inputService.pad.onTouchUp += OnTouchUp;
-        //GameServices.inputService.pad.onClickDown += OnClickDown;
+        GameServices.inputService.pad.onClickDown += OnClickDown;
         //GameServices.inputService.joyStick.JoystickMoveHandle += JoystickHandle;
         //GameServices.inputService.joyStick.JoystickEndHandle += JoystickEndHandle;
         SetJoyStickDirectTrans(m_topCollider.transform);
@@ -121,17 +121,17 @@ public class ChainRopeView : MonoBehaviour
     //按下鼠标
     void OnClickDown()
     {
-        //float varX = Input.mousePosition.x - Screen.width / 2f;
-        //float varY = Input.mousePosition.y - Screen.height / 2f;
-        //Vector2 varVec2 = GameServices.inputService.joyStick.gameObject.transform.localPosition;
-        //varVec2.x = varX;
-        //varVec2.y = varY;
-        //GameServices.inputService.joyStick.gameObject.transform.localPosition = varVec2;
+        float varX = Input.mousePosition.x - Screen.width / 2f;
+        float varY = Input.mousePosition.y - Screen.height / 2f;
+        BattleCtrl.instance.battleUI.SetMousePos(varX, varY);
 
     }
     //移动
     void OnMove(Vector3 dir)
     {
+        float varX = Input.mousePosition.x - Screen.width / 2f;
+        float varY = Input.mousePosition.y - Screen.height / 2f;
+        BattleCtrl.instance.battleUI.SetMousePos(varX, varY);
         if (!BattleCtrl.instance.isStartBattle)
         {
             return;
@@ -220,6 +220,7 @@ public class ChainRopeView : MonoBehaviour
     // 抬起回调
     void OnTouchUp()
     {
+        BattleCtrl.instance.battleUI.SetMousePos(0,0);
         if (!BattleCtrl.instance.isStartBattle)
         {
             return;
@@ -430,7 +431,7 @@ public class ChainRopeView : MonoBehaviour
         {
             GameServices.inputService.pad.onMoveVec3 -= OnMove;
             GameServices.inputService.pad.onTouchUp -= OnTouchUp;
-            //GameServices.inputService.pad.onClickDown -= OnClickDown;
+            GameServices.inputService.pad.onClickDown -= OnClickDown;
         }
         DestroyImmediate(blueprint);
         DetachHook();

FastMail/Assets/0A3_Prefabs/BattleUI.prefab

@@ -4380,6 +4380,7 @@ RectTransform:
   - {fileID: 6064464678343489378}
   - {fileID: 141872499}
   - {fileID: 767122297}
+  - {fileID: 4852413556718236688}
   m_Father: {fileID: 0}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -4480,6 +4481,7 @@ MonoBehaviour:
   m_cameraPosY: {fileID: 5895000170980641242}
   m_cameraFieldView: {fileID: 6724524176756519148}
   m_battleObj: {fileID: 6064464676328073066}
+  m_mouseObj: {fileID: 7975587463478854421}
 --- !u!114 &1995691973
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -10877,6 +10879,80 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: Button
+--- !u!1 &7975587463478854421
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 4852413556718236688}
+  - component: {fileID: 3934230584123945970}
+  - component: {fileID: 6152381190889476816}
+  m_Layer: 5
+  m_Name: Mouse
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
+--- !u!224 &4852413556718236688
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7975587463478854421}
+  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_Children: []
+  m_Father: {fileID: 6064464677632144690}
+  m_RootOrder: 9
+  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: 455, y: 538}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &3934230584123945970
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7975587463478854421}
+  m_CullTransparentMesh: 0
+--- !u!114 &6152381190889476816
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7975587463478854421}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 0
+  m_Maskable: 0
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 21300000, guid: d9a4009ec8b5f26459ef82e44026d54f, type: 3}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
 --- !u!1 &8785698347163823155
 GameObject:
   m_ObjectHideFlags: 0

FastMail/Assets/0B1_UIs/GUI Mobile Hyper-Casual/Sprites/Additional White Icons/Finger-Icon.png.meta

+fileFormatVersion: 2
+guid: d9a4009ec8b5f26459ef82e44026d54f
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 11
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: -1
+    aniso: -1
+    mipBias: -100
+    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
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  applyGammaDecoding: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: 47
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 1
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: WebGL
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

FastMail/Assets/0E1_Plugins/Obi/Samples/RopeAndRod/SampleResources/Materials/GreenRope.mat

@@ -9,7 +9,7 @@ Material:
   m_PrefabAsset: {fileID: 0}
   m_Name: GreenRope
   m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
-  m_ShaderKeywords: _EMISSION _NORMALMAP
+  m_ShaderKeywords: _EMISSION
   m_LightmapFlags: 1
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0

FastMail/Assets/0E1_Plugins/Obi/Samples/RopeAndRod/SampleResources/Materials/White.mat

+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!21 &2100000
+Material:
+  serializedVersion: 6
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: White
+  m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
+  m_ShaderKeywords: 
+  m_LightmapFlags: 4
+  m_EnableInstancingVariants: 0
+  m_DoubleSidedGI: 0
+  m_CustomRenderQueue: -1
+  stringTagMap: {}
+  disabledShaderPasses: []
+  m_SavedProperties:
+    serializedVersion: 3
+    m_TexEnvs:
+    - _BumpMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailAlbedoMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailMask:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailNormalMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _EmissionMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MainTex:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MetallicGlossMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _OcclusionMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _ParallaxMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    m_Floats:
+    - _BumpScale: 1
+    - _Cutoff: 0.5
+    - _DetailNormalMapScale: 1
+    - _DstBlend: 0
+    - _GlossMapScale: 1
+    - _Glossiness: 0.5
+    - _GlossyReflections: 1
+    - _Metallic: 0
+    - _Mode: 0
+    - _OcclusionStrength: 1
+    - _Parallax: 0.02
+    - _SmoothnessTextureChannel: 0
+    - _SpecularHighlights: 1
+    - _SrcBlend: 1
+    - _UVSec: 0
+    - _ZWrite: 1
+    m_Colors:
+    - _Color: {r: 1, g: 1, b: 1, a: 1}
+    - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}

FastMail/Assets/0E1_Plugins/Obi/Samples/RopeAndRod/SampleResources/Materials/White.mat.meta

+fileFormatVersion: 2
+guid: cc22f869ea759ca4bb8436cfe1119a21
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

FastMail/Assets/Res/Prefabs/Levels/Level5.prefab

@@ -1947,7 +1947,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 5251184818566356597}
   m_LocalRotation: {x: -0, y: -0, z: 0.7071068, w: 0.7071068}
-  m_LocalPosition: {x: -1.128, y: 2.68, z: -0.3649999}
+  m_LocalPosition: {x: -1.128, y: 2.7, z: -0.3649999}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 3728341686900101326}
@@ -1979,7 +1979,7 @@ MeshRenderer:
   m_RenderingLayerMask: 4294967295
   m_RendererPriority: 0
   m_Materials:
-  - {fileID: 2100000, guid: d402dacd6333443e5926c03c59b7b0ad, type: 2}
+  - {fileID: 2100000, guid: cc22f869ea759ca4bb8436cfe1119a21, type: 2}
   m_StaticBatchInfo:
     firstSubMesh: 0
     subMeshCount: 0
@@ -4575,9 +4575,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 622119790b3ecdf479dd087fef5e6923, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  m_ropeTrans: {fileID: 3437413262938135048}
   m_mousePosTrans: {fileID: 6314585457469301336}
-  m_ropeObj: {fileID: 5251184818566356597}
   m_speed: 1
 --- !u!1 &6731252451585019538
 GameObject: