拍照翻转缩放

FGUIProject/assets/DressUp/package.xml

@@ -166,7 +166,6 @@
     <component id="xmtl56" name="Component2.xml" path="/components/"/>
     <component id="xmtl57" name="ListItem.xml" path="/components/"/>
     <component id="i3ix58" name="PhotographSaveUI.xml" path="/" exported="true"/>
-    <image id="i3ix59" name="10db6f16973b5ce0399b85b584650d9.png" path="/"/>
     <component id="i3ix5a" name="Button12.xml" path="/components/"/>
     <image id="i3ix5c" name="pz_xiantiao.png" path="/images/"/>
   </resources>

FGUIProject/assets/RechargeStore/RechargeStoreUI.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="1080,1920">
   <displayList>
-    <image id="n2_d4iw" name="n2" src="d4iw9" fileName="images/sc_bjtu.png" xy="0,-240">
+    <image id="n2_d4iw" name="n2" src="vxw539" fileName="bgimg/zhangjie_bg.jpg" pkg="eg2y0ldp" xy="0,-240">
       <relation target="" sidePair="center-center,middle-middle"/>
     </image>
     <component id="n1_d4iw" name="valueBar" src="v3541v" fileName="components/ComponentValueBar.xml" pkg="eg2y0ldp" xy="159,90"/>

GameClient/Assets/Game/HotUpdate/DressUp/SceneController.cs

@@ -260,7 +260,7 @@ namespace GFGGame
                 BoxCollider2D boxCollider2D = childGameObj.GetComponent<BoxCollider2D>();
                 if (boxCollider2D != null)
                 {
-                    return boxCollider2D.size * childGameObj.transform.localScale * 100;
+                    return boxCollider2D.size * parentObj.transform.localScale * 100;
                 }
             }
             return Vector2.zero;

GameClient/Assets/Game/HotUpdate/Views/DressUp/PhotographView.cs

@@ -60,8 +60,6 @@ namespace GFGGame
             _ui.m_btnBg.onClick.Add(OnClickBtnBg);
             _ui.m_btnChoose.onClick.Add(OnClickBtnChoose);
             _ui.m_btnBack.onClick.Add(OnClickBtnBack);
-            _ui.m_comSelectBox.m_btnDelete.onClick.Add(OnClickBtnDelete);
-            _ui.m_comSelectBox.m_btnFlip.onClick.Add(OnClickBtnFlip);
             _ui.m_btnPhotograph.onClick.Add(OnClickBtnPhotograph);
 
             _ui.m_ComSelectRes.m_list.itemRenderer = RenderListItem;
@@ -77,6 +75,13 @@ namespace GFGGame
             _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_btnFlip.onTouchBegin.Add(OnClickBtnFlip);
+            _ui.m_comSelectBox.m_btnFlip.onTouchEnd.Add(OnClickBtnFlipEnd);
+
+            _ui.m_comSelectBox.m_btnDelete.onTouchBegin.Add(OnClickBtnDelete);
+            _ui.m_comSelectBox.m_btnDelete.onTouchEnd.Add(OnClickBtnDeleteEnd);
+
         }
 
         protected override void OnShown()
@@ -190,35 +195,30 @@ namespace GFGGame
             RaycastHit2D[] hit2Ds = Physics2D.RaycastAll(Camera.main.ScreenToWorldPoint(Input.mousePosition), Vector2.zero);
             if (hit2Ds.Length > 0)
             {
-                hitParentGameObj = SceneController.GetFirstHitObj(hit2Ds);
                 maxLayer++;
+                hitParentGameObj = SceneController.GetFirstHitObj(hit2Ds);
+                _ui.m_comSelectBox.target.visible = false;
                 if (hitParentGameObj.name != "BgRes")
                 {
                     hitParentGameObj.GetComponent<SpriteRenderer>().sortingOrder = maxLayer;
                     hitParentGameObj = hitParentGameObj.transform.parent.gameObject;
-                }
+                    _ui.m_comSelectBox.target.visible = true;
 
+                }
+                _ui.m_comSelectBox.m_btnDelete.visible = true;
+                if (hitParentGameObj == bodyParent)
+                {
+                    _ui.m_comSelectBox.m_btnDelete.visible = false;
+                }
 
-                // hitParentGameObj = hitParentGameObj.name == "BgRes" ? hitParentGameObj :
                 distance = Input.mousePosition - Camera.main.WorldToScreenPoint(hitParentGameObj.transform.position);
 
 
-
-                _ui.m_comSelectBox.target.visible = hitParentGameObj.transform.parent.gameObject == bgParent ? false : true;
                 if (_ui.m_comSelectBox.target.data == null || _ui.m_comSelectBox.target.data as GameObject != hitParentGameObj)
                 {
                     lastPos = Vector2.zero;
-                    // _ui.m_comSelectBox.target.SetScale(1, 1);
                     _ui.m_comSelectBox.target.rotation = -hitParentGameObj.transform.eulerAngles.z;
                     _ui.m_comSelectBox.target.size = SceneController.GetGameObjectSize(hitParentGameObj);
-                    // _ui.m_comSelectBox.target.SetScale(hitParentGameObj.transform.localScale.x, hitParentGameObj.transform.localScale.y);
-
-                }
-                _ui.m_comSelectBox.m_btnDelete.visible = true;
-                if (hitParentGameObj == bodyParent)
-                {
-                    _ui.m_comSelectBox.m_btnDelete.visible = false;
-
                 }
                 _ui.m_comSelectBox.target.data = hitParentGameObj;
 
@@ -297,19 +297,16 @@ namespace GFGGame
 
             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 pt2 = this.viewCom.GlobalToLocal(new Vector2(_ui.m_comSelectBox.target.x, _ui.m_comSelectBox.target.y));
-            // Debug.Log("pt1" + pt1 + "   pt2:" + pt2 + "   pt:" + pt);
+            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);
+            Debug.Log("pt1" + pt1 + "   pt2:" + pt2 + "   pt:" + pt);
 
             if (!_equipDistance.ContainsKey(gameObject))
             {
-                float distance = Vector2.Distance(pt, pt2);
+                float distance = Vector2.Distance(pt1, pt2);
                 _equipDistance.Add(gameObject, distance);
             }
             _startDistance = _equipDistance[gameObject];
-            // _startDistance = Vector2.Distance(pt1, pt2);
-            // Vector2 pt1 = _ui.m_comSelectBox.target.size;// this.viewCom.GlobalToLocal(screenPos); ;
-            // _startDistance = Vector2.Distance(pt, pt2);
             Debug.Log("_startDistance:" + _startDistance);
 
         }
@@ -319,7 +316,7 @@ namespace GFGGame
             if (gameObject == null) return;
             InputEvent inputEvent = (InputEvent)context.data;
             Vector2 pt1 = this.viewCom.GlobalToLocal(new Vector2(inputEvent.x, inputEvent.y));
-            Vector2 pt2 = this.viewCom.GlobalToLocal(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);
             Vector2 curPos = pt1 - pt2;
             Debug.Log("pt1" + pt1 + "   pt2:" + pt2 + "  curPos:" + curPos + "    lastPos:" + lastPos);
             float angle = Vector3.Angle(lastPos, curPos); //求出两向量之间的夹角 
@@ -365,7 +362,7 @@ namespace GFGGame
             gameObject.transform.localScale = new Vector3(value, value, value);
 
             Vector2 size = SceneController.GetGameObjectSize(gameObject);
-            _ui.m_comSelectBox.target.SetSize(size.x * value, size.y * value);
+            _ui.m_comSelectBox.target.SetSize(size.x, size.y);
         }
 
         private void OnRotate(EventContext context)
@@ -465,13 +462,21 @@ namespace GFGGame
         }
         private void OnClickBtnFlip()
         {
-            GameObject gameObject = _ui.m_comSelectBox.target.data as GameObject;
-            gameObject.transform.GetChild(0).Rotate(Vector3.up, 180, Space.World);
-
-            // gameObject.transform.rotation.x = 180;
+            isTouchUI = true;
+            Transform transform = (_ui.m_comSelectBox.target.data as GameObject).transform;
+            for (int i = 0; i < transform.childCount; i++)
+            {
+                transform.GetChild(i).Rotate(Vector3.up, 180, Space.World);
+            }
         }
+        private void OnClickBtnFlipEnd()
+        {
+            isTouchUI = false;
+        }
+
         private void OnClickBtnDelete()
         {
+            isTouchUI = true;
             GameObject gameObject = _ui.m_comSelectBox.target.data as GameObject;
             if (gameObject.transform.gameObject == bodyParent)
             {
@@ -492,6 +497,10 @@ namespace GFGGame
             _ui.m_comSelectBox.target.visible = false;
 
         }
+        private void OnClickBtnDeleteEnd()
+        {
+            isTouchUI = false;
+        }
         private void OnClickBtnPhotograph()
         {
             _ui.target.visible = false;

GameClient/Packages/manifest.json

@@ -1,7 +1,5 @@
 {
   "dependencies": {
-    "com.unity.2d.sprite": "1.0.0",
-    "com.unity.assetbundlebrowser": "https://github.com/Unity-Technologies/AssetBundles-Browser.git",
     "com.unity.collab-proxy": "1.3.9",
     "com.unity.ide.rider": "2.0.7",
     "com.unity.ide.visualstudio": "2.0.7",

GameClient/Packages/packages-lock.json

@@ -1,18 +1,5 @@
 {
   "dependencies": {
-    "com.unity.2d.sprite": {
-      "version": "1.0.0",
-      "depth": 0,
-      "source": "builtin",
-      "dependencies": {}
-    },
-    "com.unity.assetbundlebrowser": {
-      "version": "https://github.com/Unity-Technologies/AssetBundles-Browser.git",
-      "depth": 0,
-      "source": "git",
-      "dependencies": {},
-      "hash": "b7c279278d1a343c6957c9f15b45173d3211f01c"
-    },
     "com.unity.collab-proxy": {
       "version": "1.3.9",
       "depth": 0,