fix 实体高度 pt点

3 years ago · 5de20cf201
parent 45ca5330af
commit 5de20cf201
8 changed files with 8204 additions and 8191 deletions
--- a/client/Assets/ArticyImporter/Content/Generated/Resources/ArticyDatabase.asset
+++ b/client/Assets/ArticyImporter/Content/Generated/Resources/ArticyDatabase.asset
@ -185,6 +185,19 @@ MonoBehaviour:
  m_Script: {fileID: 11500000, guid: 4488511c690d7d247bc45f2106962d66, type: 3}
  m_Name: ArticyScriptFragments
  m_EditorClassIdentifier: 
+--- !u!114 &-2482086649021679044
+MonoBehaviour:
+  m_ObjectHideFlags: 3
+  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: 1655710724, guid: 23cdf4a0ba64c164d8ffb0c744ae259d, type: 3}
+  m_Name: HierarchyManager
+  m_EditorClassIdentifier: 
+  serializedNodes: []
 --- !u!114 &-2383945761423504911
 MonoBehaviour:
  m_ObjectHideFlags: 1
@ -343,7 +356,7 @@ MonoBehaviour:
  m_Script: {fileID: -1676762633, guid: 23cdf4a0ba64c164d8ffb0c744ae259d, type: 3}
  m_Name: ArticyDatabase
  m_EditorClassIdentifier: 
-  mHierarchy: {fileID: -1639822648299062275}
+  mHierarchy: {fileID: -2482086649021679044}
  mLocalization: {fileID: -4256971298007036964}
  mInternalProject:
    mName: touhou
--- a/client/Assets/ArticyImporter/Content/Generated/Resources/gamedata.asset
+++ b/client/Assets/ArticyImporter/Content/Generated/Resources/gamedata.asset
--- a/client/Assets/Resources/Prefab/Point.prefab
+++ b/client/Assets/Resources/Prefab/Point.prefab
@ -109,7 +109,7 @@ CapsuleCollider:
  m_Radius: 0.125
  m_Height: 0.125
  m_Direction: 1
-  m_Center: {x: 0, y: 0, z: 0}
+  m_Center: {x: 0, y: 0.125, z: 0}
 --- !u!54 &238264891813423194
 Rigidbody:
  m_ObjectHideFlags: 0
--- a/client/Assets/gamedata.articyu3d
+++ b/client/Assets/gamedata.articyu3d
@ -9758,6 +9758,68 @@
            }
          }
        },
+        {
+          "Type": "SkillMaster",
+          "Properties": {
+            "TechnicalName": "Ntt_2BE6D754",
+            "Id": "0x01000000000048AF",
+            "Parent": "0x0100000000003B59",
+            "Attachments": [],
+            "DisplayName": "空中技能-下劈",
+            "Color": {
+              "r": 0.577580452,
+              "g": 0.7605245,
+              "b": 0.7991027
+            },
+            "Text": "",
+            "ExternalId": "",
+            "Position": {
+              "x": 295.0,
+              "y": 535.0
+            },
+            "ZIndex": 0.0,
+            "Size": {
+              "w": 256.0,
+              "h": 196.0
+            },
+            "PreviewImage": {
+              "ViewBox": {
+                "x": 0.0,
+                "y": 0.0,
+                "w": 0.0,
+                "h": 0.0
+              },
+              "Mode": "FromAsset",
+              "Asset": "0x0000000000000000"
+            },
+            "ShortId": 736548692
+          },
+          "Template": {
+            "SkillCombo": {
+              "StanceStart": 10,
+              "StanceEnd": 1,
+              "TriggerType": 1,
+              "FreeLock": false,
+              "Weapon": "0x0100000000002666",
+              "SkillTrigger": []
+            },
+            "Skill": {
+              "Icon": "0x0000000000000000",
+              "Name": "空中技能-下劈",
+              "Describe": "",
+              "Timeline": "skill_hero01_long_air_skill02",
+              "SoundList": [
+                "0x0100000000001297"
+              ],
+              "AttackType": 0,
+              "AttackRangeType": 0,
+              "AttackInputType": 0,
+              "AttackRate": 1.0,
+              "StunRate": 1.0,
+              "ExecuteRate": 1.0
+            }
+          }
+        },
        {
          "Type": "SkillMaster",
          "Properties": {
@ -10128,68 +10190,6 @@
            }
          }
        },
-        {
-          "Type": "SkillMaster",
-          "Properties": {
-            "TechnicalName": "Ntt_2BE6D754",
-            "Id": "0x01000000000048AF",
-            "Parent": "0x0100000000003B59",
-            "Attachments": [],
-            "DisplayName": "空中技能-下劈",
-            "Color": {
-              "r": 0.5764706,
-              "g": 0.75686276,
-              "b": 0.8
-            },
-            "Text": "",
-            "ExternalId": "",
-            "Position": {
-              "x": 295.0,
-              "y": 535.0
-            },
-            "ZIndex": 0.0,
-            "Size": {
-              "w": 256.0,
-              "h": 196.0
-            },
-            "PreviewImage": {
-              "ViewBox": {
-                "x": 0.0,
-                "y": 0.0,
-                "w": 0.0,
-                "h": 0.0
-              },
-              "Mode": "FromAsset",
-              "Asset": "0x0000000000000000"
-            },
-            "ShortId": 736548692
-          },
-          "Template": {
-            "SkillCombo": {
-              "StanceStart": 10,
-              "StanceEnd": 1,
-              "TriggerType": 1,
-              "FreeLock": false,
-              "Weapon": "0x0100000000002666",
-              "SkillTrigger": []
-            },
-            "Skill": {
-              "Icon": "0x0000000000000000",
-              "Name": "空中技能-下劈",
-              "Describe": "",
-              "Timeline": "skill_hero01_long_air_skill02",
-              "SoundList": [
-                "0x0100000000001297"
-              ],
-              "AttackType": 0,
-              "AttackRangeType": 0,
-              "AttackInputType": 0,
-              "AttackRate": 1.0,
-              "StunRate": 1.0,
-              "ExecuteRate": 1.0
-            }
-          }
-        },
        {
          "Type": "SkillMonster",
          "Properties": {
@ -12123,7 +12123,7 @@
              "Name": "PT点红色",
              "Describe": "",
              "EntityType": 7,
-              "ViewOffset": 0.0,
+              "ViewOffset": 16.0,
              "AnimationName": ""
            }
          }
@ -12191,7 +12191,7 @@
              "Name": "PT点蓝色",
              "Describe": "",
              "EntityType": 7,
-              "ViewOffset": 0.0,
+              "ViewOffset": 16.0,
              "AnimationName": ""
            }
          }
--- a/client/ProjectSettings/DynamicsManager.asset
+++ b/client/ProjectSettings/DynamicsManager.asset
@ -18,7 +18,7 @@ PhysicsManager:
  m_ClothInterCollisionDistance: 0.1
  m_ClothInterCollisionStiffness: 0.2
  m_ContactsGeneration: 1
-  m_LayerCollisionMatrix: c9ecffff08c4ffff08c4ffffffffffff08c4ffff08c4ffff09f4ffff09f4ffff08c0ffff08c0ffffffccffff09c4ffffc8c0ffffc9c0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
+  m_LayerCollisionMatrix: c9ecffff08c4ffff08c4ffffffffffff08c4ffff08c4ffff09f4ffff09f4ffff08c4ffff08c0ffffffcdffff09c4ffffc8c0ffffc9c0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
  m_AutoSimulation: 1
  m_AutoSyncTransforms: 0
  m_ReuseCollisionCallbacks: 0
--- a/config/Partitions/'Entities'-TypedPartition(65471dbc-8598-4c8f-b7d5-a524fe2e9dd6).adpd
+++ b/config/Partitions/'Entities'-TypedPartition(65471dbc-8598-4c8f-b7d5-a524fe2e9dd6).adpd
--- a/config/ProjectInfo.lck
+++ b/config/ProjectInfo.lck
@ -1 +1 @@
-7288
+2812
--- a/config/Sessions/SessionData_LocalUser.adpd
+++ b/config/Sessions/SessionData_LocalUser.adpd