Merge branch 'master' of https://e.coding.net/shenyou-gfg/gfgclient/client

# Conflicts:
#	GameClient/Assets/Game/CSShare

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

@@ -214,14 +214,34 @@ namespace GFGGame
                     PhotographDataManager.Instance.SetItemLayer(hitGameObj, maxLayer);
                     maxLayer = PhotographDataManager.Instance.GetMaxLayer(hitGameObj, maxLayer) + 1;
                     _ui.m_comSelectBox.target.visible = true;
-
-                    SceneController.SetGameObjectCenter(hitGameObj);
+                    if (!_equipDistance.ContainsKey(hitGameObj))
+                    {
+                        SceneController.SetGameObjectCenter(hitGameObj);
+                    }
                 }
                 memoryHitGameObj = hitGameObj;
 
                 distance = Input.mousePosition - Camera.main.WorldToScreenPoint(hitGameObj.transform.position);
 
-                _ui.m_comSelectBox.target.rotation = -hitGameObj.transform.eulerAngles.z;
+                Vector3 localEulerAngles = hitGameObj.transform.localEulerAngles;
+                float rotation = 0;
+                if (localEulerAngles.y == 0)
+                {
+                    rotation = -hitGameObj.transform.localEulerAngles.z;
+                }
+                else
+                {
+                    if (hitGameObj.transform.localEulerAngles.z > 180)
+                    {
+                        rotation = hitGameObj.transform.localEulerAngles.z - 360;
+                    }
+                    else
+                    {
+                        rotation = hitGameObj.transform.localEulerAngles.z;
+                    }
+                }
+                _ui.m_comSelectBox.target.rotation = rotation;// localEulerAngles.y != 0 ? hitGameObj.transform.localEulerAngles.z : -hitGameObj.transform.localEulerAngles.z;
+                Debug.Log("rotation:" + _ui.m_comSelectBox.target.rotation + "   " + _ui.m_comSelectBox.target.rotationX + "    " + _ui.m_comSelectBox.target.rotationY);
                 _ui.m_comSelectBox.target.size = SceneController.GetGameObjectSize(hitGameObj);
                 ControllerSelectBoxPos();
             }

GameClient/Assets/Game/HotUpdate/Views/MainStory/StoryFightTargetScoreView.cs

@@ -439,7 +439,7 @@ namespace GFGGame
         }
         private void Reset()
         {
-            EventAgent.RemoveEventListener(ConstMessage.CARD_SKILL, CircleScoreStart);
+            EventAgent.RemoveEventListener(ConstMessage.CARD_SKILL, UpdateCircleResult);
 
             _ui.m_proScore.target.max = 100;
             _ui.m_proScore.target.value = 0;