qianzhuqing 3 years ago
parent
commit
7ad1ff4622

+ 8 - 8
Assets/DOTween/Editor/Imgs/Footer_dark.png.meta

@@ -6,7 +6,7 @@ TextureImporter:
   serializedVersion: 11
   mipmaps:
     mipMapMode: 0
-    enableMipMap: 1
+    enableMipMap: 0
     sRGBTexture: 1
     linearTexture: 0
     fadeOut: 0
@@ -34,10 +34,10 @@ TextureImporter:
     filterMode: 1
     aniso: 1
     mipBias: 0
-    wrapU: 0
-    wrapV: 0
-    wrapW: 0
-  nPOTScale: 1
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
+  nPOTScale: 0
   lightmap: 0
   compressionQuality: 50
   spriteMode: 0
@@ -49,9 +49,9 @@ TextureImporter:
   spriteBorder: {x: 0, y: 0, z: 0, w: 0}
   spriteGenerateFallbackPhysicsShape: 1
   alphaUsage: 1
-  alphaIsTransparency: 0
+  alphaIsTransparency: 1
   spriteTessellationDetail: -1
-  textureType: 0
+  textureType: 2
   textureShape: 1
   singleChannelComponent: 0
   maxTextureSizeSet: 0
@@ -61,7 +61,7 @@ TextureImporter:
   platformSettings:
   - serializedVersion: 3
     buildTarget: DefaultTexturePlatform
-    maxTextureSize: 2048
+    maxTextureSize: 256
     resizeAlgorithm: 0
     textureFormat: -1
     textureCompression: 1

+ 8 - 8
Assets/DOTween/Editor/Imgs/Header.jpg.meta

@@ -6,7 +6,7 @@ TextureImporter:
   serializedVersion: 11
   mipmaps:
     mipMapMode: 0
-    enableMipMap: 1
+    enableMipMap: 0
     sRGBTexture: 1
     linearTexture: 0
     fadeOut: 0
@@ -34,10 +34,10 @@ TextureImporter:
     filterMode: 1
     aniso: 1
     mipBias: 0
-    wrapU: 0
-    wrapV: 0
-    wrapW: 0
-  nPOTScale: 1
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
+  nPOTScale: 0
   lightmap: 0
   compressionQuality: 50
   spriteMode: 0
@@ -49,9 +49,9 @@ TextureImporter:
   spriteBorder: {x: 0, y: 0, z: 0, w: 0}
   spriteGenerateFallbackPhysicsShape: 1
   alphaUsage: 1
-  alphaIsTransparency: 0
+  alphaIsTransparency: 1
   spriteTessellationDetail: -1
-  textureType: 0
+  textureType: 2
   textureShape: 1
   singleChannelComponent: 0
   maxTextureSizeSet: 0
@@ -61,7 +61,7 @@ TextureImporter:
   platformSettings:
   - serializedVersion: 3
     buildTarget: DefaultTexturePlatform
-    maxTextureSize: 2048
+    maxTextureSize: 512
     resizeAlgorithm: 0
     textureFormat: -1
     textureCompression: 1

+ 1 - 1
Assets/GameMain/Scenes/CustomRole.unity

@@ -688,7 +688,7 @@ Camera:
   m_Enabled: 1
   serializedVersion: 2
   m_ClearFlags: 1
-  m_BackGroundColor: {r: 1, g: 0.6273585, b: 0.72690964, a: 0}
+  m_BackGroundColor: {r: 0.61877, g: 0.9716981, b: 0.7755437, a: 0}
   m_projectionMatrixMode: 1
   m_GateFitMode: 2
   m_FOVAxisMode: 0

+ 17 - 0
Assets/GameMain/Scripts/Entity/EntityData/RoleCustomBoneData.cs

@@ -8,6 +8,12 @@ namespace MetaClient
     {
         public Dictionary<int, PartData> bodyList;
         public Dictionary<int, PartData> faceList;
+
+        public RoleCustomData ()
+        {
+            bodyList = new Dictionary<int, PartData>();
+            faceList = new Dictionary<int, PartData>();
+        }
     }
 
     public class PartData
@@ -19,5 +25,16 @@ namespace MetaClient
         public float floatValue;
 
         public Vector3 vecValue;
+
+        public string pathValue;
+
+        public PartData(EditableBodyPart p, ModifyType type)
+        {
+            part = p;
+            modifyType = type;
+            floatValue = 1;
+            vecValue = Vector3.zero;
+            pathValue = "";
+        }
     }
 }

+ 11 - 19
Assets/GameMain/Scripts/Game/CustomRole/CustomManager.cs

@@ -24,14 +24,11 @@ namespace MetaClient
         {
             GameEntry.Event.Subscribe(CustomRoleBodyEventArgs.EventId, UpdateBody);
 
-            //bodyData = new RoleCustomData();
-            //bodyData.bonePos = new int[6];
-            //bodyData.boneScale = new float[6];
-            //for (int i = 0; i < 6; i++)
-            //{
-            //    bodyData.bonePos[i] = i;
-            //    bodyData.boneScale[i] = 1;
-            //}
+            bodyData = new RoleCustomData();
+            for (int i = 0; i < 6; i++)
+            {
+                bodyData.bodyList.Add(i, new PartData((EditableBodyPart)i, ModifyType.LengthWidthThick));
+            }
 
             //CustomRoleUtility.ShowFile();
 
@@ -48,22 +45,17 @@ namespace MetaClient
             CustomRoleBodyEventArgs crf = (CustomRoleBodyEventArgs)e;
             if (crf != null)
             {
-                //bodyData.boneScale[(int)crf.Part] = 1 + (crf.ChangeValue.x - 0.5f) * valueFloating;
-                //if (testPlayer == null)
-                //{
-                //    testPlayer = GameObject.Find("mu").GetComponent<CustomRoleController>();
-                //}
-                //if (testPlayer != null)
-                //{
-                //    testPlayer.UpdateBoneScale(crf.Part, bodyData.boneScale[(int)crf.Part]);
-                //}
+                bodyData.bodyList[(int)crf.Part].floatValue = 1 + (crf.ChangeValue.x - 0.5f) * valueFloating;
+                if (testPlayer != null)
+                {
+                    testPlayer.UpdateBoneScale(crf.Part, bodyData.bodyList[(int)crf.Part].floatValue);
+                }
             }
         }
 
         public float GetBodyBoneValue(EditableBodyPart part)
         {
-            //return 0.5f + (bodyData.boneScale[(int)part] - 1) / valueFloating;
-            return 0;
+            return 0.5f + (bodyData.bodyList[(int)part].floatValue - 1) / valueFloating;
         }
     }
 }

+ 1 - 1
Assets/GameMain/Scripts/UI/CustomRoleForm.cs

@@ -45,7 +45,7 @@ namespace MetaClient
             Scroll.anchoredPosition = new Vector2(82, Scroll.anchoredPosition.y);
             Scroll.DOAnchorPosX(-85, 0.5f).SetEase(Ease.InOutCubic).onComplete = () =>
              {
-                 Debug.Log("1111111111111111111111111");
+
              };
         }
 

+ 29 - 14
Assets/GameMain/Scripts/Utility/CustomRoleUtility.cs

@@ -20,26 +20,41 @@ public enum EditableFacePart
 /// </summary>
 public enum EditableBodyPart
 {
-    UpperArm,
-    LowerArm,
-    Hand,
-    UpperLeg,
-    LowerLeg,
-    Foot,
-    None
+    UpperArm = 0,
+    LowerArm = 1,
+    Hand = 2,
+    UpperLeg = 3,
+    LowerLeg = 4,
+    Foot = 5,
+    All = 6,
+    Neck = 7,
+    Clavicle = 8,
+    Shoulder = 9,
+    Chest = 10,//胸
+    Pleural = 11,//胸腔下部
+    Belly = 12,//肚子
+    UpperArmUp = 13,
+    UpperArmDown = 14,
+    UpperLegUp = 15,
+    UpperLegDown = 16,
+    LowerLegUp = 17,
+    LowerLegDown = 18,
+    Head = 19,
+    None = 20,
 }
 /// <summary>
 /// 编辑类型
 /// </summary>
 public enum ModifyType
 {
-    Length,//长
-    Width,//宽
-    Thick,//厚度
-    Angle,//角度
-    Color,//颜色
-    Sprite,//贴图
-    Height,//高度
+    Length = 0,//长
+    Width = 1,//宽
+    Thick = 2,//厚度
+    LengthWidthThick = 3,//长宽厚
+    Angle = 4,//角度
+    UpDown = 5,//上下
+    LeftRight = 6,//左右
+    ForwardBehind = 7,//前后
 }
 
 public static class CustomRoleUtility

+ 8 - 0
Assets/Resources.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 706b9634678192f498bd04159014bc7a
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 53 - 0
Assets/Resources/DOTweenSettings.asset

@@ -0,0 +1,53 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 16995157, guid: 30730c6fed84b6b49ab85694efb33b11, type: 3}
+  m_Name: DOTweenSettings
+  m_EditorClassIdentifier: 
+  useSafeMode: 1
+  safeModeOptions:
+    logBehaviour: 2
+    nestedTweenFailureBehaviour: 0
+  timeScale: 1
+  useSmoothDeltaTime: 0
+  maxSmoothUnscaledTime: 0.15
+  rewindCallbackMode: 0
+  showUnityEditorReport: 0
+  logBehaviour: 0
+  drawGizmos: 1
+  defaultRecyclable: 0
+  defaultAutoPlay: 3
+  defaultUpdateType: 0
+  defaultTimeScaleIndependent: 0
+  defaultEaseType: 6
+  defaultEaseOvershootOrAmplitude: 1.70158
+  defaultEasePeriod: 0
+  defaultAutoKill: 1
+  defaultLoopType: 0
+  debugMode: 0
+  debugStoreTargetId: 1
+  showPreviewPanel: 1
+  storeSettingsLocation: 0
+  modules:
+    showPanel: 0
+    audioEnabled: 1
+    physicsEnabled: 1
+    physics2DEnabled: 1
+    spriteEnabled: 1
+    uiEnabled: 1
+    textMeshProEnabled: 0
+    tk2DEnabled: 0
+    deAudioEnabled: 0
+    deUnityExtendedEnabled: 0
+    epoOutlineEnabled: 0
+  createASMDEF: 0
+  showPlayingTweens: 0
+  showPausedTweens: 0

+ 8 - 0
Assets/Resources/DOTweenSettings.asset.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: f7d7c3024344d1b4f8024df8265928cc
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: