Merge branch 'master' of https://git.coder.horse/meidomustard/modifiedMM

MultipleMaids/CM3D2/MultipleMaids/Plugin/MultipleMaids.MaidUpdate.cs

@@ -15719,7 +15719,7 @@ namespace CM3D2.MultipleMaids.Plugin
                 {
                     cameraIti = mainCamera.GetTargetPos();
                     cameraIti2 = mainCamera.GetPos();
-                    cameraItiAngle = mainCamera.GetAroundAngle();
+                    cameraItiAngle = mainCamera.transform.eulerAngles;
                     cameraItiDistance = mainCamera.GetDistance();
                     keyFlg2 = true;
                 }
@@ -15727,7 +15727,7 @@ namespace CM3D2.MultipleMaids.Plugin
                 {
                     mainCamera.SetTargetPos(cameraIti, true);
                     mainCamera.SetPos(cameraIti2);
-                    mainCamera.SetAroundAngle(cameraItiAngle, true);
+                    mainCamera.transform.eulerAngles = cameraItiAngle;
                     mainCamera.SetDistance(cameraItiDistance, true);
                     keyFlg2 = true;
                 }

MultipleMaids/CM3D2/MultipleMaids/Plugin/MultipleMaids.Update.cs

@@ -1952,8 +1952,7 @@ namespace CM3D2.MultipleMaids.Plugin
                                                             float.Parse(strArray3[29])),
                                                 true);
                         mainCamera.SetDistance(float.Parse(strArray3[30]), true);
-                        // strArray3[33] is not used
-                        mainCamera.SetAroundAngle(new Vector2(float.Parse(strArray3[32]), float.Parse(strArray3[31])), true);
+                        mainCamera.transform.eulerAngles = new Vector3(float.Parse(strArray3[31]), float.Parse(strArray3[32]), float.Parse(strArray3[33]));
                         if (int.Parse(strArray3[34]) == 1)
                         {
                             inName = strArray3[35];

MultipleMaids/CM3D2/MultipleMaids/Plugin/MultipleMaids.cs

@@ -655,7 +655,7 @@ namespace CM3D2.MultipleMaids.Plugin
         private readonly bool[] cafeFlg = new bool[maxMaidCnt];
         private Vector3 cameraIti = new Vector3(0.0f, 0.9f, 0.0f);
         private Vector3 cameraIti2;
-        private Vector2 cameraItiAngle;
+        private Vector3 cameraItiAngle;
         private float cameraItiDistance = 3f;
         private GameObject cameraObj;
         private Transform Clavicle;