Browse Source

拍照优化

zhaoyang 3 years ago
parent
commit
52e5498adc

+ 5 - 2
FGUIProject/assets/DressUp/ComChecked.xml

@@ -6,12 +6,15 @@
     </image>
     </image>
     <component id="n10_g3xa" name="btnDelete" src="g3xa4i" fileName="components/Button9.xml" xy="0,0">
     <component id="n10_g3xa" name="btnDelete" src="g3xa4i" fileName="components/Button9.xml" xy="0,0">
       <relation target="" sidePair="left-left,top-top"/>
       <relation target="" sidePair="left-left,top-top"/>
+      <Button icon="ui://mbo439wbxmtl4m"/>
     </component>
     </component>
-    <component id="n11_g3xa" name="btnFlip" src="g3xa4j" fileName="components/Button10.xml" xy="374,0">
+    <component id="n11_g3xa" name="btnFlip" src="g3xa4i" fileName="components/Button9.xml" xy="374,0">
       <relation target="" sidePair="right-right,top-top"/>
       <relation target="" sidePair="right-right,top-top"/>
+      <Button icon="ui://mbo439wbxmtl53"/>
     </component>
     </component>
-    <component id="n12_g3xa" name="btnSize" src="g3xa4k" fileName="components/Button11.xml" xy="410,255" pivot="0.5,0.5" anchor="true">
+    <component id="n12_g3xa" name="btnSize" src="g3xa4i" fileName="components/Button9.xml" xy="410,255" pivot="0.5,0.5" anchor="true">
       <relation target="" sidePair="right-right,bottom-bottom"/>
       <relation target="" sidePair="right-right,bottom-bottom"/>
+      <Button icon="ui://mbo439wbxmtl52"/>
     </component>
     </component>
   </displayList>
   </displayList>
 </component>
 </component>

+ 2 - 0
FGUIProject/assets/DressUp/PhotographUI.xml

@@ -6,9 +6,11 @@
     <component id="n1_yd72" name="btnBack" src="9xlo8" fileName="components/ButtonBack1.xml" pkg="eg2y0ldp" xy="35,80"/>
     <component id="n1_yd72" name="btnBack" src="9xlo8" fileName="components/ButtonBack1.xml" pkg="eg2y0ldp" xy="35,80"/>
     <component id="n10_i3ix" name="btnPhotograph" src="g3xa4h" fileName="components/Button8.xml" xy="919,650">
     <component id="n10_i3ix" name="btnPhotograph" src="g3xa4h" fileName="components/Button8.xml" xy="919,650">
       <relation target="" sidePair="bottom-bottom"/>
       <relation target="" sidePair="bottom-bottom"/>
+      <Button icon="ui://mbo439wbnz0t5d"/>
     </component>
     </component>
     <component id="n6_g3xa" name="btnChoose" src="g3xa4h" fileName="components/Button8.xml" xy="924,803">
     <component id="n6_g3xa" name="btnChoose" src="g3xa4h" fileName="components/Button8.xml" xy="924,803">
       <relation target="" sidePair="bottom-bottom"/>
       <relation target="" sidePair="bottom-bottom"/>
+      <Button icon="ui://mbo439wbxmtl4s"/>
     </component>
     </component>
     <component id="n5_7dea" name="ComSelectRes" src="7dea4f" fileName="components/ComSelect.xml" xy="0,1086">
     <component id="n5_7dea" name="ComSelectRes" src="7dea4f" fileName="components/ComSelect.xml" xy="0,1086">
       <relation target="" sidePair="center-center,bottom-bottom"/>
       <relation target="" sidePair="center-center,bottom-bottom"/>

+ 0 - 8
FGUIProject/assets/DressUp/components/Button10.xml

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<component size="72,72" extention="Button">
-  <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
-  <displayList>
-    <image id="n2_xmtl" name="n2" src="xmtl53" fileName="images/pz_bjanniu_2.png" xy="0,0"/>
-  </displayList>
-  <Button/>
-</component>

+ 0 - 8
FGUIProject/assets/DressUp/components/Button11.xml

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<component size="72,72" extention="Button">
-  <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
-  <displayList>
-    <image id="n1_xmtl" name="n1" src="xmtl52" fileName="images/pz_bjanniu_3.png" xy="0,0"/>
-  </displayList>
-  <Button/>
-</component>

+ 1 - 1
FGUIProject/assets/DressUp/components/Button8.xml

@@ -2,7 +2,7 @@
 <component size="125,125" extention="Button">
 <component size="125,125" extention="Button">
   <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
   <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
   <displayList>
   <displayList>
-    <loader id="n1_g3xa" name="n1" xy="0,0" size="125,125" url="ui://mbo439wbxmtl4s" autoSize="true"/>
+    <loader id="n1_g3xa" name="icon" xy="0,0" size="125,125" url="ui://mbo439wbxmtl4s" autoSize="true"/>
   </displayList>
   </displayList>
   <Button/>
   <Button/>
 </component>
 </component>

+ 1 - 3
FGUIProject/assets/DressUp/components/Button9.xml

@@ -2,9 +2,7 @@
 <component size="72,72" extention="Button">
 <component size="72,72" extention="Button">
   <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
   <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
   <displayList>
   <displayList>
-    <image id="n0_g3xa" name="n0" src="xmtl4m" fileName="images/pz_bjanniu_1.png" xy="0,0">
-      <relation target="" sidePair="width-width,height-height"/>
-    </image>
+    <loader id="n1_nz0t" name="icon" xy="0,0" size="72,72" url="ui://mbo439wbxmtl4m" autoSize="true"/>
   </displayList>
   </displayList>
   <Button/>
   <Button/>
 </component>
 </component>

BIN
FGUIProject/assets/DressUp/images/pz_pzanniu.png


+ 1 - 2
FGUIProject/assets/DressUp/package.xml

@@ -140,8 +140,6 @@
     <image id="7dea4g" name="kp_kprk_4.png" path="/images/" scale="9grid" scale9grid="52,90,104,180"/>
     <image id="7dea4g" name="kp_kprk_4.png" path="/images/" scale="9grid" scale9grid="52,90,104,180"/>
     <component id="g3xa4h" name="Button8.xml" path="/components/"/>
     <component id="g3xa4h" name="Button8.xml" path="/components/"/>
     <component id="g3xa4i" name="Button9.xml" path="/components/"/>
     <component id="g3xa4i" name="Button9.xml" path="/components/"/>
-    <component id="g3xa4j" name="Button10.xml" path="/components/"/>
-    <component id="g3xa4k" name="Button11.xml" path="/components/"/>
     <component id="g3xa4l" name="ComChecked.xml" path="/"/>
     <component id="g3xa4l" name="ComChecked.xml" path="/"/>
     <image id="xmtl4m" name="pz_bjanniu_1.png" path="/images/"/>
     <image id="xmtl4m" name="pz_bjanniu_1.png" path="/images/"/>
     <image id="xmtl4n" name="pz_xzzi_3.png" path="/images/"/>
     <image id="xmtl4n" name="pz_xzzi_3.png" path="/images/"/>
@@ -168,6 +166,7 @@
     <component id="i3ix58" name="PhotographSaveUI.xml" path="/" exported="true"/>
     <component id="i3ix58" name="PhotographSaveUI.xml" path="/" exported="true"/>
     <component id="i3ix5a" name="Button12.xml" path="/components/"/>
     <component id="i3ix5a" name="Button12.xml" path="/components/"/>
     <image id="i3ix5c" name="pz_xiantiao.png" path="/images/"/>
     <image id="i3ix5c" name="pz_xiantiao.png" path="/images/"/>
+    <image id="nz0t5d" name="pz_pzanniu.png" path="/images/"/>
   </resources>
   </resources>
   <publish name="" path="..\GameClient\Assets\ResIn\UI\DressUp" packageCount="2" genCode="true" extractAlpha="true"/>
   <publish name="" path="..\GameClient\Assets\ResIn\UI\DressUp" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>
 </packageDescription>

+ 23 - 4
GameClient/Assets/Game/HotUpdate/Data/PhotographDataManager.cs

@@ -56,12 +56,31 @@ namespace GFGGame
                 }
                 }
             }
             }
         }
         }
-        //maxLayer:当前所有物件的最上层
-        private int GetObjMaxSortingOrder(GameObject gameObject, int maxLayer)
+
+
+        public void AddEquipItem(Dictionary<int, List<int>> _equipSceneData, int itemID, out Dictionary<int, List<int>> equipSceneData)
         {
         {
-            SpriteRenderer spr = gameObject.GetComponent<SpriteRenderer>();
+            if (!_equipSceneData.ContainsKey(itemID))
+            {
+                _equipSceneData.Add(itemID, new List<int>());
+            }
+            _equipSceneData[itemID].Add(itemID);
+            equipSceneData = _equipSceneData;
+        }
 
 
-            return spr.sortingOrder > maxLayer ? spr.sortingOrder : maxLayer;
+        public void GetMaxLayer(int _maxLayer, bool isAdd, ItemCfg itemCfg, out int maxLayer)
+        {
+
+            if (isAdd)
+            {
+                _maxLayer += 1;
+            }
+            else
+            {
+                //初始场景最大层级
+                _maxLayer = itemCfg.resLayer1 > itemCfg.resLayer2 ? itemCfg.resLayer1 : itemCfg.resLayer2;
+            }
+            maxLayer = _maxLayer;
         }
         }
     }
     }
 }
 }

+ 13 - 0
GameClient/Assets/Game/HotUpdate/DressUp/SceneController.cs

@@ -154,6 +154,19 @@ namespace GFGGame
             }
             }
         }
         }
 
 
+        public static void UpdatePhotographBody(int[] equipDatas, GameObject sceneObj, bool needSetMask = false, int[] exceptTypes = null, bool showAni = true, GameObject parentObj = null)
+        {
+            SceneController.UpdateRole(equipDatas, sceneObj, false, null, false, parentObj);
+            if (EquipDataCache.cacher.IsSuitPic && EquipDataCache.cacher.suitId > 0)
+            {
+                SuitCfg suitCfg = SuitCfgArray.Instance.GetCfg(EquipDataCache.cacher.suitId);
+                DressUpUtil.UpdateBody(suitCfg.picRes, sceneObj, false, null, false, parentObj);
+            }
+            GameObject gameObject = sceneObj.transform.Find("Scene/Role/Body").gameObject;
+
+            SceneController.PhotographAddCollider(gameObject);
+
+        }
 
 
         public static void UpdatePhotographBgOrNpcOrBorder(GameObject sceneObj, EnumPhotographType type, int itemId, int maxlayer, out int maxLayer)
         public static void UpdatePhotographBgOrNpcOrBorder(GameObject sceneObj, EnumPhotographType type, int itemId, int maxlayer, out int maxLayer)
         {
         {

+ 12 - 10
GameClient/Assets/Game/HotUpdate/Views/DressUp/PhotographSaveView.cs

@@ -65,19 +65,21 @@ namespace GFGGame
             Debug.Log("文件路径:" + path);
             Debug.Log("文件路径:" + path);
             Texture2D tex = this.viewData as Texture2D;
             Texture2D tex = this.viewData as Texture2D;
             byte[] bytes = tex.EncodeToPNG();//将纹理数据,转化成一个png图片
             byte[] bytes = tex.EncodeToPNG();//将纹理数据,转化成一个png图片
-            File.WriteAllBytes(path + "/Pictures/" + fileName, bytes);
-            Timers.inst.StartCoroutine(GetSaveState(path));// ();
-            // string[] paths = new string[1];
-            // paths[0] = path;
-            // ScanFile(paths);
+            File.WriteAllBytes(path + "/Pictures/wanshijing/" + fileName, bytes);
+            GetSaveState(path);
         }
         }
-        private IEnumerator GetSaveState(string path)
+        private void GetSaveState(string path)
         {
         {
-            yield return new WaitForEndOfFrame();
-            if (File.Exists(path))
+
+            Timers.inst.Add(1, 10, (param) =>
             {
             {
-                PromptController.Instance.ShowFloatTextPrompt("保存成功");
-            }
+                if (File.Exists(path))
+                {
+                    string[] paths = { path };
+                    ScanFile(paths);
+                    PromptController.Instance.ShowFloatTextPrompt("保存成功");
+                }
+            });
         }
         }
         //刷新图片,显示到相册中
         //刷新图片,显示到相册中
         void ScanFile(string[] path)
         void ScanFile(string[] path)

+ 60 - 73
GameClient/Assets/Game/HotUpdate/Views/DressUp/PhotographView.cs

@@ -47,7 +47,8 @@ namespace GFGGame
         private PinchGesture pinchGesture;
         private PinchGesture pinchGesture;
         private RotationGesture rotationGesture;
         private RotationGesture rotationGesture;
 
 
-        private bool isTouchUI = false;
+        private bool isTouchUI = false;//点击在m_comSelectBox按钮上
+        private bool isTouchTwoPoint = false;//双指操作
         private int maxLayer = int.MinValue;//最上层的层级数
         private int maxLayer = int.MinValue;//最上层的层级数
         protected override void OnInit()
         protected override void OnInit()
         {
         {
@@ -68,19 +69,19 @@ namespace GFGGame
 
 
             _scenePrefab = GFGAsset.Load<GameObject>(ResPathUtil.GetPrefabPath("ScenePhotograph"));
             _scenePrefab = GFGAsset.Load<GameObject>(ResPathUtil.GetPrefabPath("ScenePhotograph"));
 
 
-            _ui.target.onTouchBegin.Add(OnClickUIBegin);
-            _ui.target.onTouchMove.Add(OnClickUIMove);
-            _ui.target.onTouchEnd.Add(OnClickUIEnd);
+            _ui.target.onTouchBegin.Add(OnTouchUIBegin);
+            _ui.target.onTouchMove.Add(OnTouchUIMove);
+            _ui.target.onTouchEnd.Add(OnTouchUIEnd);
 
 
-            _ui.m_comSelectBox.m_btnSize.onTouchBegin.Add(OnClickBtnSizeBegin);
-            _ui.m_comSelectBox.m_btnSize.onTouchMove.Add(OnClickBtnSizeMove);
-            _ui.m_comSelectBox.m_btnSize.onTouchEnd.Add(OnClickBtnSizeEnd);
+            _ui.m_comSelectBox.m_btnSize.onTouchBegin.Add(OnTouchBtnSizeBegin);
+            _ui.m_comSelectBox.m_btnSize.onTouchMove.Add(OnTouchBtnSizeMove);
+            _ui.m_comSelectBox.m_btnSize.onTouchEnd.Add(OnTouchBtnSizeEnd);
 
 
-            _ui.m_comSelectBox.m_btnFlip.onTouchBegin.Add(OnClickBtnFlip);
-            _ui.m_comSelectBox.m_btnFlip.onTouchEnd.Add(OnClickBtnFlipEnd);
+            _ui.m_comSelectBox.m_btnFlip.onTouchBegin.Add(OnTouchBtnFlipBegin);
+            _ui.m_comSelectBox.m_btnFlip.onTouchEnd.Add(OnTouchBtnFlipEnd);
 
 
-            _ui.m_comSelectBox.m_btnDelete.onTouchBegin.Add(OnClickBtnDelete);
-            _ui.m_comSelectBox.m_btnDelete.onTouchEnd.Add(OnClickBtnDeleteEnd);
+            _ui.m_comSelectBox.m_btnDelete.onTouchBegin.Add(OnTouchBtnDeleteBegin);
+            _ui.m_comSelectBox.m_btnDelete.onTouchEnd.Add(OnTouchBtnDeleteEnd);
 
 
         }
         }
 
 
@@ -109,13 +110,13 @@ namespace GFGGame
             _ui.m_ComSelectRes.m_comBtnTab.m_c1.selectedIndex = 0;
             _ui.m_ComSelectRes.m_comBtnTab.m_c1.selectedIndex = 0;
             OnClickBtnChoose();
             OnClickBtnChoose();
             RefreshList(EnumPhotographType.BG);
             RefreshList(EnumPhotographType.BG);
-            UpdateEquipData();
+            DisposeEquipData();
+
+            SceneController.UpdatePhotographBgOrNpcOrBorder(_sceneObject, EnumPhotographType.BG, equipDataCache.bgId, maxLayer, out maxLayer);
 
 
-            UpdateBgOrNpcOrBorder(EnumPhotographType.BG, equipDataCache.bgId);
             UpdateBody();
             UpdateBody();
             UpdateScene();
             UpdateScene();
 
 
-            // Timers.inst.Add(0.001f, 0, OnTimerListener);
         }
         }
         /************************************************************UI界面*********************************************************/
         /************************************************************UI界面*********************************************************/
         private void OnContorllerChanged(EventContext context)
         private void OnContorllerChanged(EventContext context)
@@ -166,16 +167,12 @@ namespace GFGGame
                 case EnumPhotographType.BG:
                 case EnumPhotographType.BG:
                 case EnumPhotographType.BORDER:
                 case EnumPhotographType.BORDER:
                 case EnumPhotographType.NPC:
                 case EnumPhotographType.NPC:
-                    UpdateBgOrNpcOrBorder(type, itemID);
+                    SceneController.UpdatePhotographBgOrNpcOrBorder(_sceneObject, type, itemID, maxLayer, out maxLayer);
                     break;
                     break;
 
 
                 case EnumPhotographType.SCENE:
                 case EnumPhotographType.SCENE:
-                    if (!_equipSceneData.ContainsKey(itemID))
-                    {
-                        _equipSceneData.Add(itemID, new List<int>());
-                    }
-                    _equipSceneData[itemID].Add(itemID);
 
 
+                    PhotographDataManager.Instance.AddEquipItem(_equipSceneData, itemID, out _equipSceneData);
                     SceneController.AddScene(_sceneObject, itemID, _equipSceneData[itemID].Count - 1, maxLayer + 1);
                     SceneController.AddScene(_sceneObject, itemID, _equipSceneData[itemID].Count - 1, maxLayer + 1);
                     maxLayer++;
                     maxLayer++;
                     break;
                     break;
@@ -186,30 +183,32 @@ namespace GFGGame
         }
         }
         /**************************  **********************************场景*********************************************************/
         /**************************  **********************************场景*********************************************************/
 
 
-        private void OnClickUIBegin(EventContext context)
+        private void OnTouchUIBegin(EventContext context)
         {
         {
-            context.CaptureTouch();
             if (_ui.m_ComSelectRes.target.visible == true) return;
             if (_ui.m_ComSelectRes.target.visible == true) return;
-            if (context.inputEvent.touchId != 0) return;
+            if (Stage.inst.touchCount > 1) return;//只监听1根手指
             if (isTouchUI) return;
             if (isTouchUI) return;
+            context.CaptureTouch();
+
             RaycastHit2D[] hit2Ds = Physics2D.RaycastAll(Camera.main.ScreenToWorldPoint(Input.mousePosition), Vector2.zero);
             RaycastHit2D[] hit2Ds = Physics2D.RaycastAll(Camera.main.ScreenToWorldPoint(Input.mousePosition), Vector2.zero);
             if (hit2Ds.Length > 0)
             if (hit2Ds.Length > 0)
             {
             {
                 maxLayer++;
                 maxLayer++;
                 hitParentGameObj = SceneController.GetFirstHitObj(hit2Ds);
                 hitParentGameObj = SceneController.GetFirstHitObj(hit2Ds);
+
+                _ui.m_comSelectBox.m_btnDelete.visible = true;
+                if (hitParentGameObj.name == "Body")//主角不可删除
+                {
+                    _ui.m_comSelectBox.m_btnDelete.visible = false;
+                }
                 _ui.m_comSelectBox.target.visible = false;
                 _ui.m_comSelectBox.target.visible = false;
-                if (hitParentGameObj.name != "BgRes")
+                if (hitParentGameObj.name != "BgRes")//背景不可改动层级
                 {
                 {
                     hitParentGameObj.GetComponent<SpriteRenderer>().sortingOrder = maxLayer;
                     hitParentGameObj.GetComponent<SpriteRenderer>().sortingOrder = maxLayer;
                     hitParentGameObj = hitParentGameObj.transform.parent.gameObject;
                     hitParentGameObj = hitParentGameObj.transform.parent.gameObject;
                     _ui.m_comSelectBox.target.visible = true;
                     _ui.m_comSelectBox.target.visible = true;
 
 
                 }
                 }
-                _ui.m_comSelectBox.m_btnDelete.visible = true;
-                if (hitParentGameObj == bodyParent)
-                {
-                    _ui.m_comSelectBox.m_btnDelete.visible = false;
-                }
 
 
                 distance = Input.mousePosition - Camera.main.WorldToScreenPoint(hitParentGameObj.transform.position);
                 distance = Input.mousePosition - Camera.main.WorldToScreenPoint(hitParentGameObj.transform.position);
 
 
@@ -222,29 +221,29 @@ namespace GFGGame
                 }
                 }
                 _ui.m_comSelectBox.target.data = hitParentGameObj;
                 _ui.m_comSelectBox.target.data = hitParentGameObj;
 
 
-                ControllerSelectBoxPos(hitParentGameObj);
-
+                ControllerSelectBoxPos();
             }
             }
         }
         }
 
 
-        private void OnClickUIMove(EventContext context)
+        private void OnTouchUIMove(EventContext context)
         {
         {
             if (hitParentGameObj == null) return;//未选中任何物体
             if (hitParentGameObj == null) return;//未选中任何物体
             if (Stage.inst.touchCount > 1) return;//只监听1根手指
             if (Stage.inst.touchCount > 1) return;//只监听1根手指
             if (isTouchUI) return;
             if (isTouchUI) return;
 
 
             Debug.Log("拖动");
             Debug.Log("拖动");
-            ControllerObjectPos(hitParentGameObj);
-            ControllerSelectBoxPos(hitParentGameObj);
+            ControllerObjectPos();
+            ControllerSelectBoxPos();
 
 
         }
         }
-        private void OnClickUIEnd(EventContext context)
+        private void OnTouchUIEnd(EventContext context)
         {
         {
+            if (Stage.inst.touchCount > 1) return;//只监听1根手指
             if (context.inputEvent.touchId == 0) hitParentGameObj = null;
             if (context.inputEvent.touchId == 0) hitParentGameObj = null;
         }
         }
 
 
         //选中物体的位置
         //选中物体的位置
-        private void ControllerObjectPos(GameObject hitParentGameObj)
+        private void ControllerObjectPos()
         {
         {
             hitParentGameObj.transform.position = Camera.main.ScreenToWorldPoint(Input.mousePosition - distance);
             hitParentGameObj.transform.position = Camera.main.ScreenToWorldPoint(Input.mousePosition - distance);
             if (hitParentGameObj.name == "BgRes")
             if (hitParentGameObj.name == "BgRes")
@@ -274,7 +273,7 @@ namespace GFGGame
         }
         }
 
 
         //选中框的位置
         //选中框的位置
-        private void ControllerSelectBoxPos(GameObject hitParentGameObj)
+        private void ControllerSelectBoxPos()
         {
         {
             SceneController.SetGameObjectCenter(hitParentGameObj);
             SceneController.SetGameObjectCenter(hitParentGameObj);
 
 
@@ -288,18 +287,16 @@ namespace GFGGame
 
 
 
 
 
 
-        private void OnClickBtnSizeBegin(EventContext context)
+        private void OnTouchBtnSizeBegin(EventContext context)
         {
         {
             isTouchUI = true;
             isTouchUI = true;
 
 
             GameObject gameObject = _ui.m_comSelectBox.target.data as GameObject;
             GameObject gameObject = _ui.m_comSelectBox.target.data as GameObject;
             InputEvent inputEvent = (InputEvent)context.data;
             InputEvent inputEvent = (InputEvent)context.data;
 
 
-            Vector2 screenPos = this.viewCom.GlobalToLocal(_ui.m_comSelectBox.m_btnSize.LocalToGlobal(Vector2.zero));
-            Vector2 pt = new Vector2(screenPos.x, screenPos.y);
             Vector2 pt1 = this.viewCom.GlobalToLocal(new Vector2(inputEvent.x, inputEvent.y));
             Vector2 pt1 = this.viewCom.GlobalToLocal(new Vector2(inputEvent.x, inputEvent.y));
             Vector2 pt2 = new Vector2(_ui.m_comSelectBox.target.x, _ui.m_comSelectBox.target.y);
             Vector2 pt2 = new Vector2(_ui.m_comSelectBox.target.x, _ui.m_comSelectBox.target.y);
-            Debug.Log("pt1" + pt1 + "   pt2:" + pt2 + "   pt:" + pt);
+            Debug.Log("pt1" + pt1 + "   pt2:" + pt2);
 
 
             if (!_equipDistance.ContainsKey(gameObject))
             if (!_equipDistance.ContainsKey(gameObject))
             {
             {
@@ -310,7 +307,7 @@ namespace GFGGame
             Debug.Log("_startDistance:" + _startDistance);
             Debug.Log("_startDistance:" + _startDistance);
 
 
         }
         }
-        private void OnClickBtnSizeMove(EventContext context)
+        private void OnTouchBtnSizeMove(EventContext context)
         {
         {
             GameObject gameObject = _ui.m_comSelectBox.target.data as GameObject;
             GameObject gameObject = _ui.m_comSelectBox.target.data as GameObject;
             if (gameObject == null) return;
             if (gameObject == null) return;
@@ -330,12 +327,11 @@ namespace GFGGame
             Debug.Log("dist:" + dist);
             Debug.Log("dist:" + dist);
 
 
             float ss = dist / _startDistance;
             float ss = dist / _startDistance;
-            //   float local = _equipDistance[gameObject] * gameObject.transform.localScale.x * ss / _equipDistance[gameObject];
             float newValue = Mathf.Clamp(ss, 0.1f, 2);
             float newValue = Mathf.Clamp(ss, 0.1f, 2);
             ControllerScale(newValue, gameObject);
             ControllerScale(newValue, gameObject);
 
 
         }
         }
-        private void OnClickBtnSizeEnd(EventContext context)
+        private void OnTouchBtnSizeEnd(EventContext context)
         {
         {
             isTouchUI = false;
             isTouchUI = false;
             lastPos = Vector2.zero;
             lastPos = Vector2.zero;
@@ -347,6 +343,7 @@ namespace GFGGame
         private void OnPinch(EventContext context)
         private void OnPinch(EventContext context)
         {
         {
             if (hitParentGameObj == null) return;
             if (hitParentGameObj == null) return;
+            isTouchTwoPoint = true;
 
 
             GTween.Kill(hitParentGameObj);
             GTween.Kill(hitParentGameObj);
 
 
@@ -366,9 +363,12 @@ namespace GFGGame
             _ui.m_comSelectBox.target.SetSize(size.x, size.y);
             _ui.m_comSelectBox.target.SetSize(size.x, size.y);
         }
         }
 
 
+
         private void OnRotate(EventContext context)
         private void OnRotate(EventContext context)
         {
         {
             if (hitParentGameObj == null) return;
             if (hitParentGameObj == null) return;
+            isTouchTwoPoint = true;
+
             GTween.Kill(hitParentGameObj.transform);
             GTween.Kill(hitParentGameObj.transform);
 
 
             RotationGesture gesture = (RotationGesture)context.sender;
             RotationGesture gesture = (RotationGesture)context.sender;
@@ -380,28 +380,22 @@ namespace GFGGame
             gameObject.transform.Rotate(Vector3.forward, -value, Space.World);
             gameObject.transform.Rotate(Vector3.forward, -value, Space.World);
             _ui.m_comSelectBox.target.rotation += value;
             _ui.m_comSelectBox.target.rotation += value;
         }
         }
-        //背景
-        private void UpdateBgOrNpcOrBorder(EnumPhotographType type, int itemId)
-        {
-
-            SceneController.UpdatePhotographBgOrNpcOrBorder(_sceneObject, type, itemId, maxLayer, out maxLayer);
-        }
 
 
         //主角
         //主角
         private void UpdateBody()
         private void UpdateBody()
         {
         {
 
 
-            // int[] equipDatas = equipDataCache.equipDatas;
-            SceneController.UpdateRole(_equipRoleData.ToArray(), _sceneObject, false, null, false, bodyParent);
-            if (equipDataCache.IsSuitPic && equipDataCache.suitId > 0)
-            {
-                SuitCfg suitCfg = SuitCfgArray.Instance.GetCfg(equipDataCache.suitId);
-                DressUpUtil.UpdateBody(suitCfg.picRes, _sceneObject, false, null, false, bodyParent);
-            }
-            GameObject gameObject = _sceneObject.transform.Find("Scene/Role/Body").gameObject;
+            // SceneController.UpdateRole(_equipRoleData.ToArray(), _sceneObject, false, null, false, bodyParent);
+            // if (equipDataCache.IsSuitPic && equipDataCache.suitId > 0)
+            // {
+            //     SuitCfg suitCfg = SuitCfgArray.Instance.GetCfg(equipDataCache.suitId);
+            //     DressUpUtil.UpdateBody(suitCfg.picRes, _sceneObject, false, null, false, bodyParent);
+            // }
+            // GameObject gameObject = _sceneObject.transform.Find("Scene/Role/Body").gameObject;
 
 
-            SceneController.PhotographAddCollider(gameObject);
+            // SceneController.PhotographAddCollider(gameObject);
 
 
+            SceneController.UpdatePhotographBody(_equipRoleData.ToArray(), _sceneObject, false, null, false, bodyParent);
         }
         }
         //场景道具
         //场景道具
         private void UpdateScene()
         private void UpdateScene()
@@ -411,12 +405,9 @@ namespace GFGGame
             {
             {
                 for (int i = 0; i < _equipSceneData[key].Count; i++)
                 for (int i = 0; i < _equipSceneData[key].Count; i++)
                 {
                 {
-
                     SceneController.AddScene(_sceneObject, key, i);
                     SceneController.AddScene(_sceneObject, key, i);
                     ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(key);
                     ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(key);
-                    if (itemCfg.resLayer1 > maxLayer) maxLayer = itemCfg.resLayer1;
-                    if (itemCfg.resLayer2 > maxLayer) maxLayer = itemCfg.resLayer2;
-
+                    PhotographDataManager.Instance.GetMaxLayer(maxLayer, false, itemCfg, out maxLayer);
                 }
                 }
             }
             }
         }
         }
@@ -430,18 +421,14 @@ namespace GFGGame
 
 
 
 
 
 
-        private void UpdateEquipData()
+        private void DisposeEquipData()
         {
         {
             for (int i = 0; i < equipDataCache.equipDatas.Length; i++)
             for (int i = 0; i < equipDataCache.equipDatas.Length; i++)
             {
             {
                 ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(equipDataCache.equipDatas[i]);
                 ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(equipDataCache.equipDatas[i]);
                 if (itemCfg.subType == ConstDressUpItemType.QIAN_JING || itemCfg.subType == ConstDressUpItemType.BEI_SHI || itemCfg.subType == ConstDressUpItemType.HUAN_JING)
                 if (itemCfg.subType == ConstDressUpItemType.QIAN_JING || itemCfg.subType == ConstDressUpItemType.BEI_SHI || itemCfg.subType == ConstDressUpItemType.HUAN_JING)
                 {
                 {
-                    if (!_equipSceneData.ContainsKey(itemCfg.id))
-                    {
-                        _equipSceneData.Add(itemCfg.id, new List<int>());
-                    }
-                    _equipSceneData[itemCfg.id].Add(itemCfg.id);
+                    PhotographDataManager.Instance.AddEquipItem(_equipSceneData, itemCfg.id, out _equipSceneData);
                 }
                 }
                 else
                 else
                 {
                 {
@@ -462,7 +449,7 @@ namespace GFGGame
             _ui.m_comSelectBox.target.visible = false;
             _ui.m_comSelectBox.target.visible = false;
             hitParentGameObj = null;
             hitParentGameObj = null;
         }
         }
-        private void OnClickBtnFlip()
+        private void OnTouchBtnFlipBegin()
         {
         {
             isTouchUI = true;
             isTouchUI = true;
             Transform transform = (_ui.m_comSelectBox.target.data as GameObject).transform;
             Transform transform = (_ui.m_comSelectBox.target.data as GameObject).transform;
@@ -471,12 +458,12 @@ namespace GFGGame
                 transform.GetChild(i).Rotate(Vector3.up, 180, Space.World);
                 transform.GetChild(i).Rotate(Vector3.up, 180, Space.World);
             }
             }
         }
         }
-        private void OnClickBtnFlipEnd()
+        private void OnTouchBtnFlipEnd()
         {
         {
             isTouchUI = false;
             isTouchUI = false;
         }
         }
 
 
-        private void OnClickBtnDelete()
+        private void OnTouchBtnDeleteBegin()
         {
         {
             isTouchUI = true;
             isTouchUI = true;
             GameObject gameObject = _ui.m_comSelectBox.target.data as GameObject;
             GameObject gameObject = _ui.m_comSelectBox.target.data as GameObject;
@@ -499,7 +486,7 @@ namespace GFGGame
             _ui.m_comSelectBox.target.visible = false;
             _ui.m_comSelectBox.target.visible = false;
 
 
         }
         }
-        private void OnClickBtnDeleteEnd()
+        private void OnTouchBtnDeleteEnd()
         {
         {
             isTouchUI = false;
             isTouchUI = false;
         }
         }

BIN
GameClient/Assets/ResIn/UI/DressUp/DressUp_atlas0!a.png


BIN
GameClient/Assets/ResIn/UI/DressUp/DressUp_atlas0.png


BIN
GameClient/Assets/ResIn/UI/DressUp/DressUp_fui.bytes