g更新代码

Assets/GameMgr/MainData.cs

@@ -29,8 +29,8 @@ public class MainData : MonoBehaviour, IDragHandler, IEndDragHandler, IBeginDrag
 
     void Update()
     {
-        Scale();
-        Click();
+        //Scale();
+        //Click();
     }
 
     public void Init(Texture2D _png, Sprite _jpg, ResJsonData _json)
@@ -130,23 +130,23 @@ public class MainData : MonoBehaviour, IDragHandler, IEndDragHandler, IBeginDrag
 
     public void Click()
     {
-        if (Input.GetMouseButtonDown(0))
-        {
-            pos = Input.mousePosition;
-            time = Time.unscaledTime;
-        }
-        if (Input.GetMouseButtonUp(0))
-        {
-            float f = Time.unscaledTime - time;
-            float d = Vector2.Distance(pos, Input.mousePosition);
-            Vector2 v;
-            RectTransformUtility.ScreenPointToLocalPointInRectangle(rect, Input.mousePosition, Camera.main, out v);
-            if (f < 0.5f && d < 10)
-            {
-                Debug.Log("点击：" + v);
-                UseGun(v);
-            }
-        }
+        //if (Input.GetMouseButtonDown(0))
+        //{
+        //    pos = Input.mousePosition;
+        //    time = Time.unscaledTime;
+        //}
+        //if (Input.GetMouseButtonUp(0))
+        //{
+        //    float f = Time.unscaledTime - time;
+        //    float d = Vector2.Distance(pos, Input.mousePosition);
+        //    Vector2 v;
+        //    RectTransformUtility.ScreenPointToLocalPointInRectangle(rect, Input.mousePosition, Camera.main, out v);
+        //    if (f < 0.5f && d < 10)
+        //    {
+        //        Debug.Log("点击：" + v);
+        //        UseGun(v);
+        //    }
+        //}
     }
     public void UseGun(Vector2 v)
     {

Assets/NatCorder/Examples/ReplayCam/ReplayCam.cs

@@ -41,8 +41,6 @@ namespace NatSuite.Examples {
         public AudioListener audioListener;
         public Camera cam;
 
-        public RenderTexture tex;
-
         public Transform targetpos;
 
         float val = 0;

Assets/Scenes/gameScene.unity

@@ -641,6 +641,7 @@ MonoBehaviour:
   AutoBtn: {fileID: 1354215336290540113}
   CloseBtn: {fileID: 669974489}
   Test_Text: {fileID: 1230079831}
+  ReSetPosBtn: {fileID: 3853497852481138177}
 --- !u!114 &297775251
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -2647,6 +2648,7 @@ GameObject:
   m_Component:
   - component: {fileID: 1955086771}
   - component: {fileID: 1955086772}
+  - component: {fileID: 1955086773}
   m_Layer: 0
   m_Name: GameEnd
   m_TagString: Untagged
@@ -2696,6 +2698,23 @@ MonoBehaviour:
   scrollRect: {fileID: 1921562645}
   ItemParent: {fileID: 1994532034}
   item_obj: {fileID: 1219722612}
+  cam: {fileID: 0}
+--- !u!114 &1955086773
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1955086770}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 02641e9e576064f35a2dab995981e691, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  recordMicrophone: 0
+  audioListener: {fileID: 0}
+  cam: {fileID: 0}
+  targetpos: {fileID: 0}
 --- !u!1 &1994532031
 GameObject:
   m_ObjectHideFlags: 0
@@ -2819,7 +2838,7 @@ MonoBehaviour:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 2022440214}
-  m_Enabled: 1
+  m_Enabled: 0
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
   m_Name: 
@@ -3161,36 +3180,6 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
---- !u!114 &490924220554459075
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 5458225144568688969}
-  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: ec9da1a89b6f08d449647e8be52ef1f9, 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!224 &551004409273782827
 RectTransform:
   m_ObjectHideFlags: 0
@@ -3579,18 +3568,18 @@ PrefabInstance:
     - target: {fileID: 6671647687298800481, guid: d22d30a8bc14c794682266b9e458c412, type: 3}
       propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target
       value: 
-      objectReference: {fileID: 8094727572906316438}
+      objectReference: {fileID: 9106039126864166767}
     - target: {fileID: 6671647687298800481, guid: d22d30a8bc14c794682266b9e458c412, type: 3}
       propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_CallState
       value: 2
       objectReference: {fileID: 0}
     - target: {fileID: 6671647687298800481, guid: d22d30a8bc14c794682266b9e458c412, type: 3}
       propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName
-      value: skipToHome
+      value: BackToHome_Btn
       objectReference: {fileID: 0}
     - target: {fileID: 6671647687298800481, guid: d22d30a8bc14c794682266b9e458c412, type: 3}
       propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName
-      value: gameSceneLogic, Assembly-CSharp
+      value: GroupListManager, Assembly-CSharp
       objectReference: {fileID: 0}
     - target: {fileID: 6671647687298800481, guid: d22d30a8bc14c794682266b9e458c412, type: 3}
       propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName
@@ -3761,9 +3750,9 @@ RectTransform:
   m_RootOrder: -1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 375, y: 812.00006}
-  m_SizeDelta: {x: 750, y: 1624}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: -0.000030517578}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &1183502666035523749
 CanvasRenderer:
@@ -4618,7 +4607,6 @@ GameObject:
   m_Component:
   - component: {fileID: 7255145337877875340}
   - component: {fileID: 4669581221058272242}
-  - component: {fileID: 4549851835078201933}
   - component: {fileID: 7026147387852768214}
   m_Layer: 5
   m_Name: Viewport
@@ -4733,9 +4721,9 @@ MonoBehaviour:
   m_OnClick:
     m_PersistentCalls:
       m_Calls:
-      - m_Target: {fileID: 8074077716897695280}
-        m_TargetAssemblyTypeName: mainGameView, Assembly-CSharp
-        m_MethodName: onTipHandler
+      - m_Target: {fileID: 9106039126864166767}
+        m_TargetAssemblyTypeName: GroupListManager, Assembly-CSharp
+        m_MethodName: FindGroupArea_Btn
         m_Mode: 1
         m_Arguments:
           m_ObjectArgument: {fileID: 0}
@@ -5343,19 +5331,7 @@ MonoBehaviour:
   m_TargetGraphic: {fileID: 8699291600771406965}
   m_OnClick:
     m_PersistentCalls:
-      m_Calls:
-      - m_Target: {fileID: 7128942471875113414}
-        m_TargetAssemblyTypeName: mainGameScaleMove, Assembly-CSharp
-        m_MethodName: onResetSizeCenterHandler
-        m_Mode: 1
-        m_Arguments:
-          m_ObjectArgument: {fileID: 0}
-          m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
-          m_IntArgument: 0
-          m_FloatArgument: 0
-          m_StringArgument: 
-          m_BoolArgument: 0
-        m_CallState: 2
+      m_Calls: []
 --- !u!224 &3877716837347441762
 RectTransform:
   m_ObjectHideFlags: 0
@@ -5820,36 +5796,6 @@ RectTransform:
   m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
---- !u!114 &4549851835078201933
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2043576560963876187}
-  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: ec9da1a89b6f08d449647e8be52ef1f9, 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!224 &4551049958656346328
 RectTransform:
   m_ObjectHideFlags: 0
@@ -6097,7 +6043,6 @@ GameObject:
   m_Component:
   - component: {fileID: 6786605224267383807}
   - component: {fileID: 5548338979507113673}
-  - component: {fileID: 490924220554459075}
   - component: {fileID: 7626438656205820263}
   - component: {fileID: 2619189682649296849}
   m_Layer: 5
@@ -6151,9 +6096,9 @@ MonoBehaviour:
   m_OnClick:
     m_PersistentCalls:
       m_Calls:
-      - m_Target: {fileID: 7128942471875113414}
-        m_TargetAssemblyTypeName: mainGameScaleMove, Assembly-CSharp
-        m_MethodName: onAutoFillHander
+      - m_Target: {fileID: 9106039126864166767}
+        m_TargetAssemblyTypeName: GroupListManager, Assembly-CSharp
+        m_MethodName: AutoFullArea_Btn
         m_Mode: 1
         m_Arguments:
           m_ObjectArgument: {fileID: 0}
@@ -6822,7 +6767,7 @@ MonoBehaviour:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 4951044742539944732}
-  m_Enabled: 1
+  m_Enabled: 0
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: c3deb1e6e6112304d918d673de43ccc6, type: 3}
   m_Name: 

Assets/scripts/EventName.cs

@@ -34,6 +34,10 @@ public static class EventName
         public const string Event_GroupItemClick = "Event_GroupItemClick";//点击某一个组
 
         public const string Event_AllGroupOver = "Event_AllGroupOver";//游戏结束，全部组都涂完了
+
+        public const string Event_FindGroupArea = "Event_FindGroupArea"; //提示按钮按下
+        public const string Event_AutoFullArea = "Event_AutoFullArea"; //自动涂按钮按下
+        public const string Event_BackToHome = "Event_BackToHome";  //点返回按钮
     }
 
     public class DataName

Assets/scripts/ScaleToImage.cs

 using DG.Tweening;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using UnityEngine;
@@ -49,7 +50,19 @@ public class ScaleToImage : MonoBehaviour
     private int ListMaxNum = 10;
 
     public Text Test_Text;
-    private float testscale = 1f;
+    public Button ReSetPosBtn;
+    private void Start()
+    {
+        ReSetPosBtn.gameObject.SetActive(false);
+        ReSetPosBtn.onClick.AddListener(ReSetPosBtn_Click);
+    }
+
+    private void ReSetPosBtn_Click() //重置位置
+    {
+        Debug.Log("重置位置");
+
+    }
+
     private void Update()
     {
         if (Input.touchCount == 2)

Assets/scripts/Views/GameEnd/GameEndPanel.cs

-using System;
-using System.Collections;
-using System.Collections.Generic;
+using NatSuite.Examples;
 using UnityEngine;
 using UnityEngine.UI;
 
@@ -17,6 +15,9 @@ public class GameEndPanel : MonoBehaviour
     public HorizontalLayoutGroup ItemParent;
     public GameObject item_obj;
 
+    public ReplayCam cam;
+
+
     private void Start()
     {
         ResiterEvent(true);
@@ -27,8 +28,18 @@ public class GameEndPanel : MonoBehaviour
         Continue_Btn.onClick.AddListener(Continue_Btn_Click);
 
     }
+    private void ResiterEvent(bool flag)
+    {
+        EventDispatcher.RegisterEvent(EventName.Event.Event_AllGroupOver, GameEnd, flag);
+    }
 
-    private void CreateItem() //创建列表item
+    private void GameEnd(object[] values)
+    {
+        BG.SetActive(true);
+        CreateItem();
+    }
+
+    private void CreateItem() //创建推荐图片的列表item
     {
         int childNum = 10;
         for (int i = 0; i < childNum; i++)
@@ -62,15 +73,19 @@ public class GameEndPanel : MonoBehaviour
     {
         Debug.Log("点击保存视频");
     }
-
-    private void ResiterEvent(bool flag)
+    /// <summary>
+    /// 开始录屏,调用ReplayCam.StartRecording()方法
+    /// </summary>
+    public void StartRectord()
     {
-        EventDispatcher.RegisterEvent(EventName.Event.Event_AllGroupOver, GameEnd, flag);
+        cam.StartRecording();
     }
-
-    private void GameEnd(object[] values)
+    /// <summary>
+    /// 结束录屏,调用ReplayCam.StopRectord()方法
+    /// </summary>
+    public void StopRectord()
     {
-        BG.SetActive(true);
-        CreateItem();
+        Debug.Log($"录制结束");
+        cam.StopRecording();
     }
 }

Assets/scripts/Views/gameScene/gameSceneLogic.cs

@@ -84,13 +84,13 @@ public class gameSceneLogic : MonoBehaviour, IEventHandler
         onEvent(EventName.Event.Event_GroupIsLoadOver, onGroupIsLoadOver); //组的成员加载完成,就是组列表下的item
         transform.Find("ingameLoad/loadImg").gameObject.SetActive(false);  
         //gameScenUser
-        transform.Find("areaGroupList/groupListBg").gameObject.SetActive(false);
+        //transform.Find("areaGroupList/groupListBg").gameObject.SetActive(false);
         transform.Find("areaGroupList/gameProgress/gameProgressText").gameObject.SetActive(false);
         transform.Find("areaGroupList/gameProgress").gameObject.SetActive(false);
         transform.Find("gameEndOperBase").gameObject.SetActive(false);
         transform.Find("gameEndOperBase").GetComponent<gameEndLogic>().initMember();
         transform.Find("areaGroupList/tipSelectGroup").gameObject.SetActive(false);
-        transform.Find("top").gameObject.SetActive(false);
+        //transform.Find("top").gameObject.SetActive(false);
         utilsTools.setGDataByKey(EventName.DataName.Data_PhoneOffsetValue, 50);
         utilsTools.addTimer_Sec(gameObject, "loopGetHot", (String name) =>
         {
@@ -441,7 +441,7 @@ public class gameSceneLogic : MonoBehaviour, IEventHandler
         areaGroupList.SetActive(true);
         RectTransform rectTransform = areaGroupList.GetComponent<RectTransform>();
         transform.Find("ingameLoad").gameObject.SetActive(false);
-        transform.Find("top").gameObject.SetActive(true);
+        //transform.Find("top").gameObject.SetActive(true);
         utilsTools.setGDataByKey("loadingEnd", utilsTools.getTotalMillisecond());
         RectTransform transform1 = transform.Find("areaGroupList/gameProgress/gameProgressText").GetComponent<RectTransform>();
         transform1.gameObject.SetActive(true);

Assets/scripts/Views/maingame/GroupListManager.cs

@@ -161,4 +161,28 @@ public class GroupListManager : MonoBehaviour
             item.GetComponent<colorItem>().ReSetPos();
         }
     }
+
+    //提示按钮
+    public void FindGroupArea_Btn()
+    {
+
+        Debug.Log("点提示");
+        EventDispatcher.Dispatch(EventName.Event.Event_FindGroupArea);
+    }
+
+    //自动涂的按钮
+    public void AutoFullArea_Btn()
+    {
+
+        Debug.Log("点提示");
+        EventDispatcher.Dispatch(EventName.Event.Event_AutoFullArea);
+    }
+
+    //返回主界面按钮
+    public void BackToHome_Btn()
+    {
+
+        Debug.Log("点返回");
+        EventDispatcher.Dispatch(EventName.Event.Event_BackToHome);
+    }
 }

Assets/scripts/perfabItems/colorItem.cs

@@ -205,9 +205,8 @@ public class colorItem : MonoBehaviour, IPointerDownHandler, IPointerUpHandler
         {
             return;
         }
-        GameMgr.Ins.ChooseGroup(GID);
-
         GroupListManager.Instance.ClickItem(GID, index);
+        GameMgr.Ins.ChooseGroup(GID);
     }
 
     public void SetLocalRootPos() //保存一下第一个的原始坐标