This commit is contained in:
CortexCore 2025-03-04 16:34:27 +08:00
parent c29bf0d12f
commit 42eb7b00d9
16 changed files with 64 additions and 245 deletions

View File

@ -47,6 +47,7 @@ MonoBehaviour:
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
virtualCamera: {fileID: 1938627429092953649} virtualCamera: {fileID: 1938627429092953649}
allowPlayerInput: 0
--- !u!114 &1938627429092953649 --- !u!114 &1938627429092953649
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -144,7 +145,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: bd6043bde05a7fc4cba197d06915c1e3, type: 3} m_Script: {fileID: 11500000, guid: bd6043bde05a7fc4cba197d06915c1e3, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
Damping: {x: 0.1, y: 0.5, z: 0.3} Damping: {x: 0, y: 0, z: 0}
ShoulderOffset: {x: 0.5, y: 1, z: 3.61} ShoulderOffset: {x: 0.5, y: 1, z: 3.61}
VerticalArmLength: 0.4 VerticalArmLength: 0.4
CameraSide: 1 CameraSide: 1

View File

@ -511,13 +511,13 @@ Transform:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2101684090} m_GameObject: {fileID: 2101684090}
serializedVersion: 2 serializedVersion: 2
m_LocalRotation: {x: 0.40821788, y: -0.23456968, z: 0.10938163, w: 0.8754261} m_LocalRotation: {x: 0.956963, y: -0.03517647, z: 0.25641742, w: 0.13128038}
m_LocalPosition: {x: -0.02439195, y: 0.6929022, z: -0.012478471} m_LocalPosition: {x: -0.02439195, y: 0.6929022, z: -0.012478471}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0 m_ConstrainProportionsScale: 0
m_Children: [] m_Children: []
m_Father: {fileID: 0} m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0} m_LocalEulerAnglesHint: {x: 164.377, y: -30, z: 0}
--- !u!1660057539 &9223372036854775807 --- !u!1660057539 &9223372036854775807
SceneRoots: SceneRoots:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0

View File

@ -13035,10 +13035,9 @@ MonoBehaviour:
\u3046\u3048\u306e \u307e\u3067\u3044\u304f\u3089\u304b\u306a\uff1f[\u7f8a\u987f\u5230\u4e0a\u91ce\u8eca\u7ad9\u591a\u5c11\u9322\u5462\uff1f]"},"_position":{"x":770.0,"y":236.6667},"$type":"NodeCanvas.DialogueTrees.StatementNode","$id":"0"},{"statement":{"_text":"\u3042\u306e \u3046\u3048\u306e \u307e\u3067\u3044\u304f\u3089\u304b\u306a\uff1f[\u7f8a\u987f\u5230\u4e0a\u91ce\u8eca\u7ad9\u591a\u5c11\u9322\u5462\uff1f]"},"_position":{"x":770.0,"y":236.6667},"$type":"NodeCanvas.DialogueTrees.StatementNode","$id":"0"},{"statement":{"_text":"\u3042\u306e
\u99c5\u54e1 \u3048\u304d\u3044\u3093 \u3055\u3093\u306b\u805e \u304d \u3044\u3066\u307f\u3088\u3046\uff01[\u554f\u4e00\u4e0b\u90a3\u500b\u7ad9\u52d9\u54e1\u5427\uff01]"},"_position":{"x":801.3333,"y":346.0},"$type":"NodeCanvas.DialogueTrees.StatementNode","$id":"1"},{"statement":{"_text":"\u3059\u307f\u307e\u305b\u3093\u3001 \u99c5\u54e1 \u3048\u304d\u3044\u3093 \u3055\u3093\u306b\u805e \u304d \u3044\u3066\u307f\u3088\u3046\uff01[\u554f\u4e00\u4e0b\u90a3\u500b\u7ad9\u52d9\u54e1\u5427\uff01]"},"_position":{"x":801.3333,"y":346.0},"$type":"NodeCanvas.DialogueTrees.StatementNode","$id":"1"},{"statement":{"_text":"\u3059\u307f\u307e\u305b\u3093\u3001
\u4e0a\u91ce \u3046\u3048\u306e \u307e\u3067\u3044\u304f\u3089\u3067\u3059\u304b\uff1f[\u8acb\u554f\uff0c\u53bb\u4e0a\u91ce\u8eca\u7ad9\u591a\u5c11\u9322\uff1f]"},"_position":{"x":794.3334,"y":474.0},"$type":"NodeCanvas.DialogueTrees.StatementNode","$id":"2"},{"statement":{"_text":"2300 \u4e0a\u91ce \u3046\u3048\u306e \u307e\u3067\u3044\u304f\u3089\u3067\u3059\u304b\uff1f[\u8acb\u554f\uff0c\u53bb\u4e0a\u91ce\u8eca\u7ad9\u591a\u5c11\u9322\uff1f]"},"_position":{"x":794.3334,"y":474.0},"$type":"NodeCanvas.DialogueTrees.StatementNode","$id":"2"},{"statement":{"_text":"2300
\u5186 \u3048\u3093 \u3067\u3059\u3088\u3002[2300 \u65e5\u5713\u3002]"},"_actorName":"\u552e\u7968\u5458","_actorParameterID":"f60c438a-5390-4120-9455-db9db381f93e","_position":{"x":846.9503,"y":630.1001},"$type":"NodeCanvas.DialogueTrees.StatementNode","$id":"3"},{"statement":{"_text":"\u3069\u3046\u3082\u3042\u308a\u304c\u3068\u3046\u3054\u3056\u3044\u307e\u3059\u3002[\u8b1d\u8b1d\u60a8\u3002\r]"},"_position":{"x":838.8672,"y":749.3836},"$type":"NodeCanvas.DialogueTrees.StatementNode","$id":"4"},{"statement":{"_text":"\u3044\u3044\u3048\u3002[\u4e0d\u6703\u3002]"},"_actorName":"\u552e\u7968\u5458","_actorParameterID":"f60c438a-5390-4120-9455-db9db381f93e","_position":{"x":908.3152,"y":880.7651},"$type":"NodeCanvas.DialogueTrees.StatementNode","$id":"5"},{"_action":{"items":{"_value":[1]},"$type":"Net.Project.B.NodeCanvas.GiveItemTask"},"_position":{"x":928.9413,"y":995.7518},"$type":"NodeCanvas.DialogueTrees.ActionNode","$id":"6"}],"connections":[{"_sourceNode":{"$ref":"0"},"_targetNode":{"$ref":"1"},"$type":"NodeCanvas.DialogueTrees.DTConnection"},{"_sourceNode":{"$ref":"1"},"_targetNode":{"$ref":"2"},"$type":"NodeCanvas.DialogueTrees.DTConnection"},{"_sourceNode":{"$ref":"2"},"_targetNode":{"$ref":"3"},"$type":"NodeCanvas.DialogueTrees.DTConnection"},{"_sourceNode":{"$ref":"3"},"_targetNode":{"$ref":"4"},"$type":"NodeCanvas.DialogueTrees.DTConnection"},{"_sourceNode":{"$ref":"4"},"_targetNode":{"$ref":"5"},"$type":"NodeCanvas.DialogueTrees.DTConnection"},{"_sourceNode":{"$ref":"5"},"_targetNode":{"$ref":"6"},"$type":"NodeCanvas.DialogueTrees.DTConnection"}],"canvasGroups":[],"localBlackboard":{"_variables":{}},"derivedData":{"actorParameters":[{"_keyName":"\u552e\u7968\u5458","_id":"f60c438a-5390-4120-9455-db9db381f93e","_actorObject":2}],"$type":"NodeCanvas.DialogueTrees.DialogueTree+DerivedSerializationData"}}' \u5186 \u3048\u3093 \u3067\u3059\u3088\u3002[2300 \u65e5\u5713\u3002]"},"_actorName":"\u552e\u7968\u5458","_actorParameterID":"f60c438a-5390-4120-9455-db9db381f93e","_position":{"x":846.9503,"y":630.1001},"$type":"NodeCanvas.DialogueTrees.StatementNode","$id":"3"},{"statement":{"_text":"\u3069\u3046\u3082\u3042\u308a\u304c\u3068\u3046\u3054\u3056\u3044\u307e\u3059\u3002[\u8b1d\u8b1d\u60a8\u3002\r]"},"_position":{"x":838.8672,"y":749.3836},"$type":"NodeCanvas.DialogueTrees.StatementNode","$id":"4"},{"statement":{"_text":"\u3044\u3044\u3048\u3002[\u4e0d\u6703\u3002]"},"_actorName":"\u552e\u7968\u5458","_actorParameterID":"f60c438a-5390-4120-9455-db9db381f93e","_position":{"x":908.3152,"y":880.7651},"$type":"NodeCanvas.DialogueTrees.StatementNode","$id":"5"}],"connections":[{"_sourceNode":{"$ref":"0"},"_targetNode":{"$ref":"1"},"$type":"NodeCanvas.DialogueTrees.DTConnection"},{"_sourceNode":{"$ref":"1"},"_targetNode":{"$ref":"2"},"$type":"NodeCanvas.DialogueTrees.DTConnection"},{"_sourceNode":{"$ref":"2"},"_targetNode":{"$ref":"3"},"$type":"NodeCanvas.DialogueTrees.DTConnection"},{"_sourceNode":{"$ref":"3"},"_targetNode":{"$ref":"4"},"$type":"NodeCanvas.DialogueTrees.DTConnection"},{"_sourceNode":{"$ref":"4"},"_targetNode":{"$ref":"5"},"$type":"NodeCanvas.DialogueTrees.DTConnection"}],"canvasGroups":[],"localBlackboard":{"_variables":{}},"derivedData":{"actorParameters":[{"_keyName":"\u552e\u7968\u5458","_id":"f60c438a-5390-4120-9455-db9db381f93e","_actorObject":1}],"$type":"NodeCanvas.DialogueTrees.DialogueTree+DerivedSerializationData"}}'
_boundGraphObjectReferences: _boundGraphObjectReferences:
- {fileID: 0} - {fileID: 0}
- {fileID: 11400000, guid: 47e9bc1509e356449a49dec710c8351f, type: 2}
- {fileID: 925529740} - {fileID: 925529740}
_boundGraphSource: _boundGraphSource:
_version: 3.29 _version: 3.29
@ -22090,16 +22089,17 @@ MonoBehaviour:
\u9858\r\u306d\u304c\r\u3044\u307e\u3059\u3002[\u8acb\u5728\u9019\u88e1\u7c3d\u540d\u3002]"},"_actorName":"\u5de5\u4f5c\u4eba\u5458","_actorParameterID":"6b650f48-df8a-4cc8-99a7-e65961c6c205","_position":{"x":714.128,"y":2177.045},"$type":"NodeCanvas.DialogueTrees.StatementNode","$id":"15"},{"statement":{"_text":"\u306f\u3044\u3002[\u597d\u7684\u3002]"},"_position":{"x":853.2208,"y":2290.365},"$type":"NodeCanvas.DialogueTrees.StatementNode","$id":"16"},{"statement":{"_text":"\u3067\u306f\u3053\u3061\u3089\u304c \u9858\r\u306d\u304c\r\u3044\u307e\u3059\u3002[\u8acb\u5728\u9019\u88e1\u7c3d\u540d\u3002]"},"_actorName":"\u5de5\u4f5c\u4eba\u5458","_actorParameterID":"6b650f48-df8a-4cc8-99a7-e65961c6c205","_position":{"x":714.128,"y":2177.045},"$type":"NodeCanvas.DialogueTrees.StatementNode","$id":"15"},{"statement":{"_text":"\u306f\u3044\u3002[\u597d\u7684\u3002]"},"_position":{"x":853.2208,"y":2290.365},"$type":"NodeCanvas.DialogueTrees.StatementNode","$id":"16"},{"statement":{"_text":"\u3067\u306f\u3053\u3061\u3089\u304c
\u65e5\u672c\u5186 \u306b\u307b\u3093\u3048\u3093 \u3068 \u660e\u7d30\u66f8 \u3081\u3044\u3055\u3044\u3057\u3087 \u65e5\u672c\u5186 \u306b\u307b\u3093\u3048\u3093 \u3068 \u660e\u7d30\u66f8 \u3081\u3044\u3055\u3044\u3057\u3087
\u306b\u306a\u308a\u307e\u3059\u3002 \u304a \u78ba \u305f\u3057 \u304b\u3081\u304f\u3060\u3055\u3044\u307e\u305b\u3002[\u90a3\u9019\u662f\u65e5\u5713\u548c\u660e\u7d30\u8868\u3002\u8acb\u78ba\u8a8d\u4e00\u4e0b\u3002]"},"_actorName":"\u5de5\u4f5c\u4eba\u5458","_actorParameterID":"6b650f48-df8a-4cc8-99a7-e65961c6c205","_position":{"x":738.5692,"y":2406.793},"$type":"NodeCanvas.DialogueTrees.StatementNode","$id":"17"},{"statement":{"_text":"\u306f\u3044\u3002[\u597d\u7684\r]"},"_position":{"x":851.3472,"y":2547.987},"$type":"NodeCanvas.DialogueTrees.StatementNode","$id":"18"},{"statement":{"_text":"\u306f\u3044\u3001OK \u306b\u306a\u308a\u307e\u3059\u3002 \u304a \u78ba \u305f\u3057 \u304b\u3081\u304f\u3060\u3055\u3044\u307e\u305b\u3002[\u90a3\u9019\u662f\u65e5\u5713\u548c\u660e\u7d30\u8868\u3002\u8acb\u78ba\u8a8d\u4e00\u4e0b\u3002]"},"_actorName":"\u5de5\u4f5c\u4eba\u5458","_actorParameterID":"6b650f48-df8a-4cc8-99a7-e65961c6c205","_position":{"x":738.5692,"y":2406.793},"$type":"NodeCanvas.DialogueTrees.StatementNode","$id":"17"},{"statement":{"_text":"\u306f\u3044\u3002[\u597d\u7684\r]"},"_position":{"x":851.3472,"y":2547.987},"$type":"NodeCanvas.DialogueTrees.StatementNode","$id":"18"},{"statement":{"_text":"\u306f\u3044\u3001OK
\u3067\u3059\u3002[OK\uff0c\u53ef\u4ee5]"},"_actorName":"\u5de5\u4f5c\u4eba\u5458","_actorParameterID":"6b650f48-df8a-4cc8-99a7-e65961c6c205","_position":{"x":827.3565,"y":2671.938},"$type":"NodeCanvas.DialogueTrees.StatementNode","$id":"19"},{"statement":{"_text":"\u3042\u308a\u304c\u3068\u3046\u3054\u3056\u307e\u3057\u305f\u3002[\u8b1d\u8b1d\u3002]"},"_actorName":"\u5de5\u4f5c\u4eba\u5458","_actorParameterID":"6b650f48-df8a-4cc8-99a7-e65961c6c205","_position":{"x":830.6903,"y":2777.896},"$type":"NodeCanvas.DialogueTrees.StatementNode","$id":"20"},{"statement":{"_text":"\u3069\u3046\u3082\u3002[\u8b1d\u8b1d]"},"_position":{"x":861.6667,"y":2902.667},"$type":"NodeCanvas.DialogueTrees.StatementNode","$id":"21"}],"connections":[{"_sourceNode":{"$ref":"0"},"_targetNode":{"$ref":"1"},"$type":"NodeCanvas.DialogueTrees.DTConnection"},{"_sourceNode":{"$ref":"1"},"_targetNode":{"$ref":"2"},"$type":"NodeCanvas.DialogueTrees.DTConnection"},{"_sourceNode":{"$ref":"2"},"_targetNode":{"$ref":"3"},"$type":"NodeCanvas.DialogueTrees.DTConnection"},{"_sourceNode":{"$ref":"3"},"_targetNode":{"$ref":"4"},"$type":"NodeCanvas.DialogueTrees.DTConnection"},{"_sourceNode":{"$ref":"4"},"_targetNode":{"$ref":"5"},"$type":"NodeCanvas.DialogueTrees.DTConnection"},{"_sourceNode":{"$ref":"5"},"_targetNode":{"$ref":"6"},"$type":"NodeCanvas.DialogueTrees.DTConnection"},{"_sourceNode":{"$ref":"6"},"_targetNode":{"$ref":"7"},"$type":"NodeCanvas.DialogueTrees.DTConnection"},{"_sourceNode":{"$ref":"7"},"_targetNode":{"$ref":"8"},"$type":"NodeCanvas.DialogueTrees.DTConnection"},{"_sourceNode":{"$ref":"8"},"_targetNode":{"$ref":"9"},"$type":"NodeCanvas.DialogueTrees.DTConnection"},{"_sourceNode":{"$ref":"9"},"_targetNode":{"$ref":"10"},"$type":"NodeCanvas.DialogueTrees.DTConnection"},{"_sourceNode":{"$ref":"10"},"_targetNode":{"$ref":"11"},"$type":"NodeCanvas.DialogueTrees.DTConnection"},{"_sourceNode":{"$ref":"11"},"_targetNode":{"$ref":"12"},"$type":"NodeCanvas.DialogueTrees.DTConnection"},{"_sourceNode":{"$ref":"12"},"_targetNode":{"$ref":"13"},"$type":"NodeCanvas.DialogueTrees.DTConnection"},{"_sourceNode":{"$ref":"13"},"_targetNode":{"$ref":"14"},"$type":"NodeCanvas.DialogueTrees.DTConnection"},{"_sourceNode":{"$ref":"14"},"_targetNode":{"$ref":"15"},"$type":"NodeCanvas.DialogueTrees.DTConnection"},{"_sourceNode":{"$ref":"15"},"_targetNode":{"$ref":"16"},"$type":"NodeCanvas.DialogueTrees.DTConnection"},{"_sourceNode":{"$ref":"16"},"_targetNode":{"$ref":"17"},"$type":"NodeCanvas.DialogueTrees.DTConnection"},{"_sourceNode":{"$ref":"17"},"_targetNode":{"$ref":"18"},"$type":"NodeCanvas.DialogueTrees.DTConnection"},{"_sourceNode":{"$ref":"18"},"_targetNode":{"$ref":"19"},"$type":"NodeCanvas.DialogueTrees.DTConnection"},{"_sourceNode":{"$ref":"19"},"_targetNode":{"$ref":"20"},"$type":"NodeCanvas.DialogueTrees.DTConnection"},{"_sourceNode":{"$ref":"20"},"_targetNode":{"$ref":"21"},"$type":"NodeCanvas.DialogueTrees.DTConnection"}],"canvasGroups":[],"localBlackboard":{"_variables":{}},"derivedData":{"actorParameters":[{"_keyName":"\u5de5\u4f5c\u4eba\u5458","_id":"6b650f48-df8a-4cc8-99a7-e65961c6c205","_actorObject":1}],"$type":"NodeCanvas.DialogueTrees.DialogueTree+DerivedSerializationData"}}' \u3067\u3059\u3002[OK\uff0c\u53ef\u4ee5]"},"_actorName":"\u5de5\u4f5c\u4eba\u5458","_actorParameterID":"6b650f48-df8a-4cc8-99a7-e65961c6c205","_position":{"x":827.3565,"y":2671.938},"$type":"NodeCanvas.DialogueTrees.StatementNode","$id":"19"},{"statement":{"_text":"\u3042\u308a\u304c\u3068\u3046\u3054\u3056\u307e\u3057\u305f\u3002[\u8b1d\u8b1d\u3002]"},"_actorName":"\u5de5\u4f5c\u4eba\u5458","_actorParameterID":"6b650f48-df8a-4cc8-99a7-e65961c6c205","_position":{"x":830.6903,"y":2777.896},"$type":"NodeCanvas.DialogueTrees.StatementNode","$id":"20"},{"statement":{"_text":"\u3069\u3046\u3082\u3002[\u8b1d\u8b1d]"},"_position":{"x":861.6667,"y":2902.667},"$type":"NodeCanvas.DialogueTrees.StatementNode","$id":"21"},{"_action":{"items":{"_value":[1]},"$type":"Net.Project.B.NodeCanvas.GiveItemTask"},"_position":{"x":877.0001,"y":3010.333},"$type":"NodeCanvas.DialogueTrees.ActionNode","$id":"22"}],"connections":[{"_sourceNode":{"$ref":"0"},"_targetNode":{"$ref":"1"},"$type":"NodeCanvas.DialogueTrees.DTConnection"},{"_sourceNode":{"$ref":"1"},"_targetNode":{"$ref":"2"},"$type":"NodeCanvas.DialogueTrees.DTConnection"},{"_sourceNode":{"$ref":"2"},"_targetNode":{"$ref":"3"},"$type":"NodeCanvas.DialogueTrees.DTConnection"},{"_sourceNode":{"$ref":"3"},"_targetNode":{"$ref":"4"},"$type":"NodeCanvas.DialogueTrees.DTConnection"},{"_sourceNode":{"$ref":"4"},"_targetNode":{"$ref":"5"},"$type":"NodeCanvas.DialogueTrees.DTConnection"},{"_sourceNode":{"$ref":"5"},"_targetNode":{"$ref":"6"},"$type":"NodeCanvas.DialogueTrees.DTConnection"},{"_sourceNode":{"$ref":"6"},"_targetNode":{"$ref":"7"},"$type":"NodeCanvas.DialogueTrees.DTConnection"},{"_sourceNode":{"$ref":"7"},"_targetNode":{"$ref":"8"},"$type":"NodeCanvas.DialogueTrees.DTConnection"},{"_sourceNode":{"$ref":"8"},"_targetNode":{"$ref":"9"},"$type":"NodeCanvas.DialogueTrees.DTConnection"},{"_sourceNode":{"$ref":"9"},"_targetNode":{"$ref":"10"},"$type":"NodeCanvas.DialogueTrees.DTConnection"},{"_sourceNode":{"$ref":"10"},"_targetNode":{"$ref":"11"},"$type":"NodeCanvas.DialogueTrees.DTConnection"},{"_sourceNode":{"$ref":"11"},"_targetNode":{"$ref":"12"},"$type":"NodeCanvas.DialogueTrees.DTConnection"},{"_sourceNode":{"$ref":"12"},"_targetNode":{"$ref":"13"},"$type":"NodeCanvas.DialogueTrees.DTConnection"},{"_sourceNode":{"$ref":"13"},"_targetNode":{"$ref":"14"},"$type":"NodeCanvas.DialogueTrees.DTConnection"},{"_sourceNode":{"$ref":"14"},"_targetNode":{"$ref":"15"},"$type":"NodeCanvas.DialogueTrees.DTConnection"},{"_sourceNode":{"$ref":"15"},"_targetNode":{"$ref":"16"},"$type":"NodeCanvas.DialogueTrees.DTConnection"},{"_sourceNode":{"$ref":"16"},"_targetNode":{"$ref":"17"},"$type":"NodeCanvas.DialogueTrees.DTConnection"},{"_sourceNode":{"$ref":"17"},"_targetNode":{"$ref":"18"},"$type":"NodeCanvas.DialogueTrees.DTConnection"},{"_sourceNode":{"$ref":"18"},"_targetNode":{"$ref":"19"},"$type":"NodeCanvas.DialogueTrees.DTConnection"},{"_sourceNode":{"$ref":"19"},"_targetNode":{"$ref":"20"},"$type":"NodeCanvas.DialogueTrees.DTConnection"},{"_sourceNode":{"$ref":"20"},"_targetNode":{"$ref":"21"},"$type":"NodeCanvas.DialogueTrees.DTConnection"},{"_sourceNode":{"$ref":"21"},"_targetNode":{"$ref":"22"},"$type":"NodeCanvas.DialogueTrees.DTConnection"}],"canvasGroups":[],"localBlackboard":{"_variables":{}},"derivedData":{"actorParameters":[{"_keyName":"\u5de5\u4f5c\u4eba\u5458","_id":"6b650f48-df8a-4cc8-99a7-e65961c6c205","_actorObject":2}],"$type":"NodeCanvas.DialogueTrees.DialogueTree+DerivedSerializationData"}}'
_boundGraphObjectReferences: _boundGraphObjectReferences:
- {fileID: 0} - {fileID: 0}
- {fileID: 11400000, guid: 47e9bc1509e356449a49dec710c8351f, type: 2}
- {fileID: 2096682037} - {fileID: 2096682037}
_boundGraphSource: _boundGraphSource:
_version: 3.29 _version: 3.29
_category: _category:
_comments: _comments:
_translation: {x: 258, y: -1300} _translation: {x: -335, y: -2697}
_zoomFactor: 0.6190521 _zoomFactor: 1
_firstActivation: 2 _firstActivation: 2
_enableAction: 1 _enableAction: 1
_disableAction: 2 _disableAction: 2

View File

@ -691333,7 +691333,7 @@ PrefabInstance:
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 5630170439344028599, guid: 98352849c75d3674198e1053c3cda8ab, type: 3} - target: {fileID: 5630170439344028599, guid: 98352849c75d3674198e1053c3cda8ab, type: 3}
propertyPath: m_LocalRotation.x propertyPath: m_LocalRotation.x
value: -0.7071068 value: 0.7071068
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 5630170439344028599, guid: 98352849c75d3674198e1053c3cda8ab, type: 3} - target: {fileID: 5630170439344028599, guid: 98352849c75d3674198e1053c3cda8ab, type: 3}
propertyPath: m_LocalRotation.y propertyPath: m_LocalRotation.y
@ -691345,7 +691345,7 @@ PrefabInstance:
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 5630170439344028599, guid: 98352849c75d3674198e1053c3cda8ab, type: 3} - target: {fileID: 5630170439344028599, guid: 98352849c75d3674198e1053c3cda8ab, type: 3}
propertyPath: m_LocalEulerAnglesHint.x propertyPath: m_LocalEulerAnglesHint.x
value: -90 value: 90
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 5630170439344028599, guid: 98352849c75d3674198e1053c3cda8ab, type: 3} - target: {fileID: 5630170439344028599, guid: 98352849c75d3674198e1053c3cda8ab, type: 3}
propertyPath: m_LocalEulerAnglesHint.y propertyPath: m_LocalEulerAnglesHint.y

View File

@ -27,7 +27,7 @@ namespace BITKit
public class MyHandle:IDisposable public class MyHandle:IDisposable
{ {
private readonly ValidHandle _validHandle; private readonly ValidHandle _validHandle;
private bool _isDisable = false; private readonly bool _isDisable;
public MyHandle(ValidHandle validHandle,bool isDisable = false) public MyHandle(ValidHandle validHandle,bool isDisable = false)
{ {
_validHandle = validHandle; _validHandle = validHandle;
@ -61,106 +61,76 @@ namespace BITKit
public override string ToString() public override string ToString()
{ {
return $"Allow:{enableHandle}\nElements:{string.Join("\n",objs)}\nDisableElements:{string.Join("\n",disableObjs)}"; return $"Allow:{_enableHandle}\nElements:{string.Join("\n",_objs)}\nDisableElements:{string.Join("\n",_disableObjs)}";
} }
public ValidHandle() {} public ValidHandle() {}
public ValidHandle(Action<bool> boolDelegate) public ValidHandle(Action<bool> boolDelegate)
{ {
AddListener(boolDelegate); AddListener(boolDelegate);
EventOnEnableChanged?.Invoke(enableHandle); _eventOnEnableChanged?.Invoke(_enableHandle);
} }
public static implicit operator bool(ValidHandle validHandle) public static implicit operator bool(ValidHandle validHandle)
{ {
return !validHandle._isDisposed && validHandle.enableHandle; return !validHandle._isDisposed && validHandle._enableHandle;
} }
public bool Allow => this; public bool Allow => this;
private bool enableHandle; private bool _enableHandle;
/// <summary> /// <summary>
/// ⚠Dont operate this field directly /// ⚠Dont operate this field directly
/// </summary> /// </summary>
public readonly List<object> objs = new List<object>(); private readonly HashSet<object> _objs = new();
/// <summary> /// <summary>
/// ⚠Dont operate this field directly /// ⚠Dont operate this field directly
/// </summary> /// </summary>
public readonly List<object> disableObjs = new List<object>(); private readonly HashSet<object> _disableObjs = new();
private bool tempEnable; private bool _tempEnable;
private Action<bool> EventOnEnableChanged; private Action<bool> _eventOnEnableChanged;
private readonly ConcurrentQueue<UniTaskCompletionSource> _completionSources = new(); private readonly ConcurrentQueue<UniTaskCompletionSource> _completionSources = new();
private bool _isDisposed; private bool _isDisposed;
public void AddElement(object obj) public void AddElement(object obj)
{ {
if (objs.Contains(obj)) _objs.Add(obj);
{
}
else
{
objs.Add(obj);
}
CheckEnable(); CheckEnable();
} }
private void CheckEnable() private void CheckEnable()
{ {
tempEnable = objs.Count > 0 && disableObjs.Count == 0; _tempEnable = _objs.Count > 0 && _disableObjs.Count == 0;
if (tempEnable != enableHandle) if (_tempEnable == _enableHandle) return;
_enableHandle = _tempEnable;
_eventOnEnableChanged?.Invoke(_enableHandle);
if (_tempEnable) return;
if (_completionSources.TryDequeue(out var cs))
{ {
enableHandle = tempEnable; cs.TrySetResult();
if (EventOnEnableChanged is not null)
{
EventOnEnableChanged.Invoke(enableHandle);
}
if (tempEnable) return;
if (_completionSources.TryDequeue(out var cs))
{
cs.TrySetResult();
}
} }
} }
public void RemoveElement(object obj) public void RemoveElement(object obj)
{ {
if (objs.Contains(obj)) if (_objs.Contains(obj))
{ {
objs.Remove(obj); _objs.Remove(obj);
} }
else
{
}
CheckEnable(); CheckEnable();
} }
public int lenght => objs.Count; public int Lenght => _objs.Count;
public string[] GetElements() public bool Contains(object obj) => _objs.Contains(obj);
{
List<string> elementNames = new List<string>();
for (int i = 0; i < objs.Count; i++)
{
elementNames.Add(objs[i].ToString());
}
return elementNames.ToArray();
}
public bool Contains(object obj) => objs.Contains(obj);
public void AddDisableElements(object obj) public void AddDisableElements(object obj)
{ {
if (disableObjs.Contains(obj)) _disableObjs.Add(obj);
{
}
else
{
disableObjs.Add(obj);
}
CheckEnable(); CheckEnable();
} }
public void RemoveDisableElements(object obj) public void RemoveDisableElements(object obj)
{ {
if (disableObjs.Contains(obj)) if (_disableObjs.Contains(obj))
{ {
disableObjs.Remove(obj); _disableObjs.Remove(obj);
} }
else else
{ {
@ -191,22 +161,22 @@ namespace BITKit
} }
public void Invoke() public void Invoke()
{ {
var enable = disableObjs.Count == 0 && objs.Count > 0; var enable = _disableObjs.Count == 0 && _objs.Count > 0;
EventOnEnableChanged?.Invoke(enable); _eventOnEnableChanged?.Invoke(enable);
} }
public void Invoke(bool value) public void Invoke(bool value)
{ {
EventOnEnableChanged?.Invoke(value); _eventOnEnableChanged?.Invoke(value);
} }
public void AddListener(Action<bool> action) public void AddListener(Action<bool> action)
{ {
EventOnEnableChanged+= action; _eventOnEnableChanged+= action;
} }
public void RemoveListener(Action<bool> action) public void RemoveListener(Action<bool> action)
{ {
if(EventOnEnableChanged is not null && action is not null) if(_eventOnEnableChanged is not null && action is not null)
{ {
EventOnEnableChanged -= action; _eventOnEnableChanged -= action;
} }
} }
public UniTask.Awaiter GetAwaiter() public UniTask.Awaiter GetAwaiter()
@ -221,17 +191,17 @@ namespace BITKit
} }
public void Clear() public void Clear()
{ {
objs.Clear(); _objs.Clear();
disableObjs.Clear(); _disableObjs.Clear();
Invoke(); Invoke();
} }
public void Dispose() public void Dispose()
{ {
_isDisposed = true; _isDisposed = true;
objs.Clear(); _objs.Clear();
disableObjs.Clear(); _disableObjs.Clear();
EventOnEnableChanged = null; _eventOnEnableChanged = null;
} }
} }

View File

@ -27,22 +27,31 @@ namespace BITKit.Physics
var vertices = _mesh.vertices; var vertices = _mesh.vertices;
if (vertices.Length > 256) return false; if (vertices.Length > 2048) return false;
var minPos = new Vector3(64, 64, 64); var minPos = new Vector3(64, 64, 64);
var minDistance = 64f;
for (var index = 0; index < _mesh.triangles.Length; index+=3) for (var index = 0; index < _mesh.triangles.Length; index+=3)
{ {
var x = vertices[_mesh.triangles[index]]; var x = vertices[_mesh.triangles[index]];
if (Vector3.Distance(x, _position) > minDistance)
{
continue;
}
var y = vertices[_mesh.triangles[index + 1]]; var y = vertices[_mesh.triangles[index + 1]];
var z = vertices[_mesh.triangles[index + 2]]; var z = vertices[_mesh.triangles[index + 2]];
var pos = GeometryUtils.GetPosInTriangle(x, y, z, _position); var pos = GeometryUtils.GetPosInTriangle(x, y, z, _position);
if (Vector3.Distance(pos, _position) < Vector3.Distance(minPos, _position)) var distance = Vector3.Distance(pos, _position);
{
minPos = pos; if (!(distance < minDistance)) continue;
}
minPos = pos;
minDistance = distance;
} }
position = minPos; position = minPos;

View File

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

View File

@ -1,20 +0,0 @@
{
"name": "BITKit.Extensions.TranslucentImage",
"rootNamespace": "",
"references": [
"GUID:14fe60d984bf9f84eac55c6ea033a8f4",
"GUID:6ef4ed8ff60a7aa4bb60a8030e6f4008",
"GUID:ff218ee40fe2b8648ab3234d56415557"
],
"includePlatforms": [],
"excludePlatforms": [],
"allowUnsafeCode": false,
"overrideReferences": false,
"precompiledReferences": [],
"autoReferenced": true,
"defineConstraints": [
"LeTai_TranslucentImage"
],
"versionDefines": [],
"noEngineReferences": false
}

View File

@ -1,7 +0,0 @@
fileFormatVersion: 2
guid: f4dea7f9c2d5c3d4abb7467736ee56df
AssemblyDefinitionImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -1,21 +0,0 @@
using System;
using System.Collections;
using System.Collections.Generic;
using LeTai.Asset.TranslucentImage;
using UnityEngine;
namespace BITKit.UX
{
public class TranslucentService : MonoBehaviour
{
public static RenderTexture BlurredScreen;
[SerializeField] private TranslucentImageSource source;
[SerializeField] private RenderTexture blurredScreen;
private void LateUpdate()
{
source.Request();
BlurredScreen = blurredScreen = source.BlurredScreen;
}
}
}

View File

@ -1,11 +0,0 @@
fileFormatVersion: 2
guid: 14ba5b1e81092234d944bec5c7063bc1
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -1,34 +0,0 @@
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
using UnityEngine.UIElements;
namespace BITKit.UX
{
public class TranslucentVisualElement : VisualElement
{
public new class UxmlFactory : UxmlFactory<TranslucentVisualElement, UxmlTraits> { }
public TranslucentVisualElement()
{
RegisterCallback<GeometryChangedEvent>(OnGeometryChanged);
generateVisualContent += DrawCanvas;
}
private void DrawCanvas(MeshGenerationContext obj)
{
}
private void OnGeometryChanged(GeometryChangedEvent evt)
{
#if UNITY_EDITOR
if (BITAppForUnity.IsPlaying is false) return;
#endif
if (style.display.value is not DisplayStyle.Flex) return;
style.backgroundImage = new StyleBackground(Background.FromRenderTexture(TranslucentService.BlurredScreen));
}
}
}

View File

@ -1,11 +0,0 @@
fileFormatVersion: 2
guid: 45ff73d2202441b44a5453c22ebf0dab
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -1,38 +0,0 @@
using System;
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
using UnityEngine.UI;
namespace BITKit.UX
{
public class UXTranslucentService : MonoBehaviour
{
[SerializeField] private Image image;
private float alpha;
private void Start()
{
BITAppForUnity.AllowCursor.AddListener(OnCursor);
destroyCancellationToken.Register(Dispose);
}
private void Dispose()
{
BITAppForUnity.AllowCursor.RemoveListener(OnCursor);
}
private void OnCursor(bool obj)
{
image.enabled = obj;
if (obj) alpha = 0;
}
private void LateUpdate()
{
if (BITAppForUnity.AllowCursor.Allow && alpha is not 1)
{
alpha = Mathf.Clamp01(alpha + Time.deltaTime*5);
image.color = new Color(0, 0, 0, alpha);
}
}
}
}

View File

@ -1,11 +0,0 @@
fileFormatVersion: 2
guid: c99210a06ff163b4ab4bfce7ebbccbe9
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -540,15 +540,15 @@ Material:
- _utsVersionY: 10 - _utsVersionY: 10
- _utsVersionZ: 2 - _utsVersionZ: 2
m_Colors: m_Colors:
- _1st_ShadeColor: {r: 0.78616345, g: 0.78616345, b: 0.78616345, a: 1} - _1st_ShadeColor: {r: 0.7735849, g: 0.7735849, b: 0.7735849, a: 1}
- _2nd_ShadeColor: {r: 0.59119487, g: 0.59119487, b: 0.59119487, a: 1} - _2nd_ShadeColor: {r: 0.59119487, g: 0.59119487, b: 0.59119487, a: 1}
- _AngelRingMaskColor: {r: 0, g: 1, b: 0, a: 1} - _AngelRingMaskColor: {r: 0, g: 1, b: 0, a: 1}
- _AngelRing_Color: {r: 1, g: 1, b: 1, a: 1} - _AngelRing_Color: {r: 1, g: 1, b: 1, a: 1}
- _Ap_RimLightColor: {r: 1, g: 1, b: 1, a: 1} - _Ap_RimLightColor: {r: 1, g: 1, b: 1, a: 1}
- _BaseColor: {r: 0.9063317, g: 0.9063317, b: 0.9063317, a: 1} - _BaseColor: {r: 1, g: 1, b: 1, a: 1}
- _BaseColorMap_MipInfo: {r: 0, g: 0, b: 0, a: 0} - _BaseColorMap_MipInfo: {r: 0, g: 0, b: 0, a: 0}
- _BaseColorMaskColor: {r: 1, g: 1, b: 1, a: 1} - _BaseColorMaskColor: {r: 1, g: 1, b: 1, a: 1}
- _Color: {r: 0.9063317, g: 0.9063317, b: 0.9063317, a: 1} - _Color: {r: 1, g: 1, b: 1, a: 1}
- _ColorShift: {r: 0, g: 0, b: 0, a: 1} - _ColorShift: {r: 0, g: 0, b: 0, a: 1}
- _Color_A_1: {r: 1, g: 1, b: 1, a: 0} - _Color_A_1: {r: 1, g: 1, b: 1, a: 0}
- _Color_A_2: {r: 1, g: 1, b: 1, a: 0} - _Color_A_2: {r: 1, g: 1, b: 1, a: 0}