提交修改

This commit is contained in:
PC-20230316NUNE\Administrator 2024-09-25 23:45:48 +08:00
parent 5384a31884
commit e822544d9c
38 changed files with 4683 additions and 4351 deletions

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@ -36,15 +36,10 @@ namespace Game.JNGState.Logic.Data
return base.IsEquals(data) && Value.Auth.Equals(node.Value.Auth);
}
public override EDPlayerValue GetDifference(ISData diffValue = null)
public override void Difference(EDPlayerValue value, EDPlayerValue diff)
{
var diff = diffValue as EDPlayerData;
var value = base.GetDifference(diffValue);
if (value is null || diff is null) return null;
if (diff.Value.Auth is not null) value.Auth = diff.Value.Auth;
return value;
base.Difference(value, diff);
if (diff.Auth is not null && !Equals(Value.Auth, diff.Auth)) value.Auth = diff.Auth;
}
public override void UData(EDPlayerValue data)

View File

@ -92,18 +92,23 @@ namespace Game.JNGState.Logic.Data
}
}
public virtual T GetDifference(ISData diffValue = null)
public T GetDifference(ISData diffValue = null)
{
var diff = diffValue as Self;
if (diff is null || IsEquals(diffValue)) return null;
var value = new T();
if (diff.Value.Position is not null) value.Position = diff.Value.Position;
Difference(value,diff.Value);
return value;
}
public virtual void Difference(T value, T diff)
{
if (diff.Position is not null && !Equals(Value.Position, diff.Position)) value.Position = diff.Position;
}
public sealed override void UByte(byte[] bytes)
{
if (bytes.Length == 0) return;

File diff suppressed because it is too large Load Diff

View File

@ -1,3 +1,3 @@
Base path: 'C:/APP/UnityEdit/2021.3.33f1c1/Editor/Data', plugins path 'C:/APP/UnityEdit/2021.3.33f1c1/Editor/Data/PlaybackEngines'
Base path: 'D:/Unity/Unity2021.3.34f1/Editor/Data', plugins path 'D:/Unity/Unity2021.3.34f1/Editor/Data/PlaybackEngines'
Cmd: initializeCompiler

View File

@ -7,7 +7,7 @@
"dependencies": {
"com.unity.modules.ai": "1.0.0"
},
"url": "https://packages.unity.cn"
"url": "https://packages.unity.com"
},
"com.unity.cinemachine": {
"version": "2.10.1",
@ -16,28 +16,28 @@
"dependencies": {
"com.unity.test-framework": "1.1.31"
},
"url": "https://packages.unity.cn"
"url": "https://packages.unity.com"
},
"com.unity.collab-proxy": {
"version": "2.2.0",
"depth": 0,
"source": "registry",
"dependencies": {},
"url": "https://packages.unity.cn"
"url": "https://packages.unity.com"
},
"com.unity.editorcoroutines": {
"version": "1.0.0",
"depth": 1,
"source": "registry",
"dependencies": {},
"url": "https://packages.unity.cn"
"url": "https://packages.unity.com"
},
"com.unity.ext.nunit": {
"version": "1.0.6",
"depth": 1,
"source": "registry",
"dependencies": {},
"url": "https://packages.unity.cn"
"url": "https://packages.unity.com"
},
"com.unity.feature.development": {
"version": "1.0.1",
@ -45,7 +45,7 @@
"source": "builtin",
"dependencies": {
"com.unity.ide.visualstudio": "2.0.22",
"com.unity.ide.rider": "3.0.26",
"com.unity.ide.rider": "3.0.27",
"com.unity.ide.vscode": "1.2.5",
"com.unity.editorcoroutines": "1.0.0",
"com.unity.performance.profile-analyzer": "1.2.2",
@ -60,7 +60,7 @@
"dependencies": {
"com.unity.ext.nunit": "1.0.6"
},
"url": "https://packages.unity.cn"
"url": "https://packages.unity.com"
},
"com.unity.ide.visualstudio": {
"version": "2.0.22",
@ -69,28 +69,28 @@
"dependencies": {
"com.unity.test-framework": "1.1.9"
},
"url": "https://packages.unity.cn"
"url": "https://packages.unity.com"
},
"com.unity.ide.vscode": {
"version": "1.2.5",
"depth": 0,
"source": "registry",
"dependencies": {},
"url": "https://packages.unity.cn"
"url": "https://packages.unity.com"
},
"com.unity.performance.profile-analyzer": {
"version": "1.2.2",
"depth": 1,
"source": "registry",
"dependencies": {},
"url": "https://packages.unity.cn"
"url": "https://packages.unity.com"
},
"com.unity.settings-manager": {
"version": "1.0.3",
"depth": 2,
"source": "registry",
"dependencies": {},
"url": "https://packages.unity.cn"
"url": "https://packages.unity.com"
},
"com.unity.test-framework": {
"version": "1.1.33",
@ -101,7 +101,7 @@
"com.unity.modules.imgui": "1.0.0",
"com.unity.modules.jsonserialize": "1.0.0"
},
"url": "https://packages.unity.cn"
"url": "https://packages.unity.com"
},
"com.unity.testtools.codecoverage": {
"version": "1.2.4",
@ -111,7 +111,7 @@
"com.unity.test-framework": "1.0.16",
"com.unity.settings-manager": "1.0.1"
},
"url": "https://packages.unity.cn"
"url": "https://packages.unity.com"
},
"com.unity.textmeshpro": {
"version": "3.0.6",
@ -120,19 +120,19 @@
"dependencies": {
"com.unity.ugui": "1.0.0"
},
"url": "https://packages.unity.cn"
"url": "https://packages.unity.com"
},
"com.unity.timeline": {
"version": "1.6.5",
"depth": 0,
"source": "registry",
"dependencies": {
"com.unity.modules.audio": "1.0.0",
"com.unity.modules.director": "1.0.0",
"com.unity.modules.animation": "1.0.0",
"com.unity.modules.audio": "1.0.0",
"com.unity.modules.particlesystem": "1.0.0"
},
"url": "https://packages.unity.cn"
"url": "https://packages.unity.com"
},
"com.unity.ugui": {
"version": "1.0.0",
@ -151,7 +151,7 @@
"com.unity.ugui": "1.0.0",
"com.unity.modules.jsonserialize": "1.0.0"
},
"url": "https://packages.unity.cn"
"url": "https://packages.unity.com"
},
"com.unity.modules.ai": {
"version": "1.0.0",

View File

@ -21,7 +21,7 @@ MonoBehaviour:
m_Registries:
- m_Id: main
m_Name:
m_Url: https://packages.unity.cn
m_Url: https://packages.unity.com
m_Scopes: []
m_IsDefault: 1
m_Capabilities: 7
@ -31,6 +31,6 @@ MonoBehaviour:
m_RegistryInfoDraft:
m_Modified: 0
m_ErrorMessage:
m_UserModificationsInstanceId: -842
m_OriginalInstanceId: -844
m_UserModificationsInstanceId: -826
m_OriginalInstanceId: -828
m_LoadAssets: 0

View File

@ -86,11 +86,6 @@ PlayerSettings:
hideHomeButton: 0
submitAnalytics: 1
usePlayerLog: 1
autoStreaming: 0
useAnimationStreaming: 0
useFontStreaming: 0
autoStreamingId:
instantGameAppId:
bakeCollisionMeshes: 0
forceSingleInstance: 0
useFlipModelSwapchain: 1
@ -371,6 +366,103 @@ PlayerSettings:
m_Height: 36
m_Kind: 0
m_SubKind:
- m_BuildTarget: iPhone
m_Icons:
- m_Textures: []
m_Width: 180
m_Height: 180
m_Kind: 0
m_SubKind: iPhone
- m_Textures: []
m_Width: 120
m_Height: 120
m_Kind: 0
m_SubKind: iPhone
- m_Textures: []
m_Width: 167
m_Height: 167
m_Kind: 0
m_SubKind: iPad
- m_Textures: []
m_Width: 152
m_Height: 152
m_Kind: 0
m_SubKind: iPad
- m_Textures: []
m_Width: 76
m_Height: 76
m_Kind: 0
m_SubKind: iPad
- m_Textures: []
m_Width: 120
m_Height: 120
m_Kind: 3
m_SubKind: iPhone
- m_Textures: []
m_Width: 80
m_Height: 80
m_Kind: 3
m_SubKind: iPhone
- m_Textures: []
m_Width: 80
m_Height: 80
m_Kind: 3
m_SubKind: iPad
- m_Textures: []
m_Width: 40
m_Height: 40
m_Kind: 3
m_SubKind: iPad
- m_Textures: []
m_Width: 87
m_Height: 87
m_Kind: 1
m_SubKind: iPhone
- m_Textures: []
m_Width: 58
m_Height: 58
m_Kind: 1
m_SubKind: iPhone
- m_Textures: []
m_Width: 29
m_Height: 29
m_Kind: 1
m_SubKind: iPhone
- m_Textures: []
m_Width: 58
m_Height: 58
m_Kind: 1
m_SubKind: iPad
- m_Textures: []
m_Width: 29
m_Height: 29
m_Kind: 1
m_SubKind: iPad
- m_Textures: []
m_Width: 60
m_Height: 60
m_Kind: 2
m_SubKind: iPhone
- m_Textures: []
m_Width: 40
m_Height: 40
m_Kind: 2
m_SubKind: iPhone
- m_Textures: []
m_Width: 40
m_Height: 40
m_Kind: 2
m_SubKind: iPad
- m_Textures: []
m_Width: 20
m_Height: 20
m_Kind: 2
m_SubKind: iPad
- m_Textures: []
m_Width: 1024
m_Height: 1024
m_Kind: 4
m_SubKind: App Store
m_BuildTargetBatching:
- m_BuildTarget: Standalone
m_StaticBatching: 1

View File

@ -1,2 +1,2 @@
m_EditorVersion: 2021.3.33f1c1
m_EditorVersionWithRevision: 2021.3.33f1c1 (682b9db7927c)
m_EditorVersion: 2021.3.34f1
m_EditorVersionWithRevision: 2021.3.34f1 (25266724e7bd)

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@ -17,9 +17,9 @@ MonoBehaviour:
x: 0
y: 43
width: 1920
height: 1037
height: 989
m_ShowMode: 4
m_Title: "\u6E38\u620F"
m_Title: Game
m_RootView: {fileID: 2}
m_MinSize: {x: 875, y: 300}
m_MaxSize: {x: 10000, y: 10000}
@ -45,7 +45,7 @@ MonoBehaviour:
x: 0
y: 0
width: 1920
height: 1037
height: 989
m_MinSize: {x: 875, y: 300}
m_MaxSize: {x: 10000, y: 10000}
m_UseTopView: 1
@ -90,7 +90,7 @@ MonoBehaviour:
m_Position:
serializedVersion: 2
x: 0
y: 1017
y: 969
width: 1920
height: 20
m_MinSize: {x: 0, y: 0}
@ -115,11 +115,11 @@ MonoBehaviour:
x: 0
y: 30
width: 1920
height: 987
height: 939
m_MinSize: {x: 400, y: 200}
m_MaxSize: {x: 32384, y: 16192}
vertical: 0
controlID: 94
controlID: 15
--- !u!114 &6
MonoBehaviour:
m_ObjectHideFlags: 52
@ -140,11 +140,11 @@ MonoBehaviour:
x: 0
y: 0
width: 1467
height: 987
height: 939
m_MinSize: {x: 300, y: 200}
m_MaxSize: {x: 24288, y: 16192}
vertical: 1
controlID: 95
controlID: 16
--- !u!114 &7
MonoBehaviour:
m_ObjectHideFlags: 52
@ -166,11 +166,11 @@ MonoBehaviour:
x: 0
y: 0
width: 1467
height: 528
height: 502
m_MinSize: {x: 300, y: 100}
m_MaxSize: {x: 24288, y: 8096}
vertical: 0
controlID: 96
controlID: 17
--- !u!114 &8
MonoBehaviour:
m_ObjectHideFlags: 52
@ -189,7 +189,7 @@ MonoBehaviour:
x: 0
y: 0
width: 263
height: 528
height: 502
m_MinSize: {x: 201, y: 221}
m_MaxSize: {x: 4001, y: 4021}
m_ActualView: {fileID: 15}
@ -215,7 +215,7 @@ MonoBehaviour:
x: 263
y: 0
width: 595
height: 528
height: 502
m_MinSize: {x: 202, y: 221}
m_MaxSize: {x: 4002, y: 4021}
m_ActualView: {fileID: 16}
@ -242,7 +242,7 @@ MonoBehaviour:
x: 858
y: 0
width: 609
height: 528
height: 502
m_MinSize: {x: 102, y: 121}
m_MaxSize: {x: 4002, y: 4021}
m_ActualView: {fileID: 20}
@ -266,9 +266,9 @@ MonoBehaviour:
m_Position:
serializedVersion: 2
x: 0
y: 528
y: 502
width: 1467
height: 459
height: 437
m_MinSize: {x: 101, y: 121}
m_MaxSize: {x: 4001, y: 4021}
m_ActualView: {fileID: 14}
@ -295,9 +295,9 @@ MonoBehaviour:
x: 1467
y: 0
width: 453
height: 987
m_MinSize: {x: 276, y: 71}
m_MaxSize: {x: 4001, y: 4021}
height: 939
m_MinSize: {x: 275, y: 50}
m_MaxSize: {x: 4000, y: 4000}
m_ActualView: {fileID: 19}
m_Panes:
- {fileID: 19}
@ -319,7 +319,7 @@ MonoBehaviour:
m_MinSize: {x: 300, y: 360}
m_MaxSize: {x: 4000, y: 4000}
m_TitleContent:
m_Text: "\u5BFC\u822A"
m_Text: Navigation
m_Image: {fileID: 1087843850482249999, guid: 0000000000000000d000000000000000, type: 0}
m_Tooltip:
m_Pos:
@ -348,15 +348,15 @@ MonoBehaviour:
m_MinSize: {x: 100, y: 100}
m_MaxSize: {x: 4000, y: 4000}
m_TitleContent:
m_Text: "\u63A7\u5236\u53F0"
m_Text: Console
m_Image: {fileID: -4327648978806127646, guid: 0000000000000000d000000000000000, type: 0}
m_Tooltip:
m_Pos:
serializedVersion: 2
x: 0
y: 601
y: 575
width: 1466
height: 438
height: 416
m_ViewDataDictionary: {fileID: 0}
m_OverlayCanvas:
m_LastAppliedPresetName: Default
@ -377,7 +377,7 @@ MonoBehaviour:
m_MinSize: {x: 200, y: 200}
m_MaxSize: {x: 4000, y: 4000}
m_TitleContent:
m_Text: "\u5C42\u7EA7"
m_Text: Hierarchy
m_Image: {fileID: 7966133145522015247, guid: 0000000000000000d000000000000000, type: 0}
m_Tooltip:
m_Pos:
@ -385,7 +385,7 @@ MonoBehaviour:
x: 0
y: 73
width: 262
height: 507
height: 481
m_ViewDataDictionary: {fileID: 0}
m_OverlayCanvas:
m_LastAppliedPresetName: Default
@ -394,9 +394,9 @@ MonoBehaviour:
m_SceneHierarchy:
m_TreeViewState:
scrollPos: {x: 0, y: 0}
m_SelectedIDs:
m_SelectedIDs: 38980000
m_LastClickedID: 0
m_ExpandedIDs: cef5ffff24f6ffffe2f8ffffe6f8ffff1afbffff
m_ExpandedIDs: 60e2ffff78ecffffbceeffff12efffffd0f1ffffd4f1ffff74faffff3c91000010980000
m_RenameOverlay:
m_UserAcceptedRename: 0
m_Name:
@ -435,7 +435,7 @@ MonoBehaviour:
m_MinSize: {x: 200, y: 200}
m_MaxSize: {x: 4000, y: 4000}
m_TitleContent:
m_Text: "\u573A\u666F"
m_Text: Scene
m_Image: {fileID: 2593428753322112591, guid: 0000000000000000d000000000000000, type: 0}
m_Tooltip:
m_Pos:
@ -443,7 +443,7 @@ MonoBehaviour:
x: 263
y: 73
width: 593
height: 507
height: 481
m_ViewDataDictionary: {fileID: 0}
m_OverlayCanvas:
m_LastAppliedPresetName: Default
@ -734,9 +734,9 @@ MonoBehaviour:
m_PlayAudio: 0
m_AudioPlay: 0
m_Position:
m_Target: {x: 104.11677, y: 87.14451, z: -68.7427}
m_Target: {x: 85.20835, y: 116.73124, z: -125.85036}
speed: 2
m_Value: {x: 104.11677, y: 87.14451, z: -68.7427}
m_Value: {x: 85.20835, y: 116.73124, z: -125.85036}
m_RenderMode: 0
m_CameraMode:
drawMode: 0
@ -783,13 +783,13 @@ MonoBehaviour:
m_GridAxis: 1
m_gridOpacity: 0.5
m_Rotation:
m_Target: {x: -0.35256705, y: -0.0022476835, z: 0.000847305, w: -0.9357961}
m_Target: {x: -0.3228703, y: 0.016180936, z: -0.0055207084, w: -0.9462912}
speed: 2
m_Value: {x: -0.35256287, y: -0.002247657, z: 0.000847295, w: -0.93578506}
m_Value: {x: -0.32286957, y: 0.016180899, z: -0.005520696, w: -0.94628906}
m_Size:
m_Target: 0.8660254
m_Target: 2.598076
speed: 2
m_Value: 0.8660254
m_Value: 2.598076
m_Ortho:
m_Target: 0
speed: 2
@ -829,7 +829,7 @@ MonoBehaviour:
m_MinSize: {x: 455, y: 354}
m_MaxSize: {x: 4000, y: 4000}
m_TitleContent:
m_Text: "\u8D44\u6E90\u5546\u5E97"
m_Text: Asset Store
m_Image: {fileID: -8693916549880196297, guid: 0000000000000000d000000000000000, type: 0}
m_Tooltip:
m_Pos:
@ -858,15 +858,15 @@ MonoBehaviour:
m_MinSize: {x: 230, y: 250}
m_MaxSize: {x: 10000, y: 10000}
m_TitleContent:
m_Text: "\u9879\u76EE"
m_Text: Project
m_Image: {fileID: -5467254957812901981, guid: 0000000000000000d000000000000000, type: 0}
m_Tooltip:
m_Pos:
serializedVersion: 2
x: 0
y: 601
y: 575
width: 1466
height: 438
height: 416
m_ViewDataDictionary: {fileID: 0}
m_OverlayCanvas:
m_LastAppliedPresetName: Default
@ -883,23 +883,23 @@ MonoBehaviour:
m_SkipHidden: 0
m_SearchArea: 1
m_Folders:
- Assets/Scripts
- Assets
m_Globs: []
m_OriginalText:
m_FilterByTypeIntersection: 0
m_ViewMode: 1
m_StartGridSize: 96
m_LastFolders:
- Assets/Scripts
- Assets
m_LastFoldersGridSize: 96
m_LastProjectPath: D:\Jisol\JisolGame\JNFrame2
m_LastProjectPath: D:\myproject\JisolGame\JNFrame2
m_LockTracker:
m_IsLocked: 0
m_FolderTreeState:
scrollPos: {x: 0, y: 0}
m_SelectedIDs: 8e740000
m_LastClickedID: 29838
m_ExpandedIDs: 0000000024740000
m_SelectedIDs: e0740000
m_LastClickedID: 29920
m_ExpandedIDs: 00000000e0740000e2740000e4740000e6740000e8740000ea740000ec740000ee740000f0740000f2740000f4740000f6740000f8740000fa740000fc74000000ca9a3bffffff7f
m_RenameOverlay:
m_UserAcceptedRename: 0
m_Name:
@ -927,7 +927,7 @@ MonoBehaviour:
scrollPos: {x: 0, y: 0}
m_SelectedIDs:
m_LastClickedID: 0
m_ExpandedIDs: 0000000024740000
m_ExpandedIDs: 00000000e0740000e2740000e4740000e6740000e8740000ea740000ec740000ee740000f0740000f2740000f4740000f6740000f8740000fa740000fc740000
m_RenameOverlay:
m_UserAcceptedRename: 0
m_Name:
@ -952,9 +952,9 @@ MonoBehaviour:
m_Icon: {fileID: 0}
m_ResourceFile:
m_ListAreaState:
m_SelectedInstanceIDs: ce2e0000
m_LastClickedInstanceID: 11982
m_HadKeyboardFocusLastEvent: 1
m_SelectedInstanceIDs:
m_LastClickedInstanceID: 0
m_HadKeyboardFocusLastEvent: 0
m_ExpandedInstanceIDs: c623000000000000
m_RenameOverlay:
m_UserAcceptedRename: 0
@ -998,7 +998,7 @@ MonoBehaviour:
m_MinSize: {x: 275, y: 50}
m_MaxSize: {x: 4000, y: 4000}
m_TitleContent:
m_Text: "\u68C0\u67E5\u5668"
m_Text: Inspector
m_Image: {fileID: -2667387946076563598, guid: 0000000000000000d000000000000000, type: 0}
m_Tooltip:
m_Pos:
@ -1006,7 +1006,7 @@ MonoBehaviour:
x: 1467
y: 73
width: 452
height: 966
height: 918
m_ViewDataDictionary: {fileID: 0}
m_OverlayCanvas:
m_LastAppliedPresetName: Default
@ -1040,7 +1040,7 @@ MonoBehaviour:
m_MinSize: {x: 100, y: 100}
m_MaxSize: {x: 4000, y: 4000}
m_TitleContent:
m_Text: "\u6E38\u620F"
m_Text: Game
m_Image: {fileID: -6423792434712278376, guid: 0000000000000000d000000000000000, type: 0}
m_Tooltip:
m_Pos:
@ -1048,7 +1048,7 @@ MonoBehaviour:
x: 858
y: 73
width: 607
height: 507
height: 481
m_ViewDataDictionary: {fileID: 0}
m_OverlayCanvas:
m_LastAppliedPresetName: Default
@ -1062,7 +1062,7 @@ MonoBehaviour:
m_ShowGizmos: 0
m_TargetDisplay: 0
m_ClearColor: {r: 0, g: 0, b: 0, a: 0}
m_TargetSize: {x: 607, y: 486}
m_TargetSize: {x: 607, y: 460}
m_TextureFilterMode: 0
m_TextureHideFlags: 61
m_RenderIMGUI: 1
@ -1079,8 +1079,8 @@ MonoBehaviour:
vZoomLockedByDefault: 0
m_HBaseRangeMin: -303.5
m_HBaseRangeMax: 303.5
m_VBaseRangeMin: -243
m_VBaseRangeMax: 243
m_VBaseRangeMin: -230
m_VBaseRangeMax: 230
m_HAllowExceedBaseRangeMin: 1
m_HAllowExceedBaseRangeMax: 1
m_VAllowExceedBaseRangeMin: 1
@ -1089,7 +1089,7 @@ MonoBehaviour:
m_HSlider: 0
m_VSlider: 0
m_IgnoreScrollWheelUntilClicked: 0
m_EnableMouseInput: 0
m_EnableMouseInput: 1
m_EnableSliderZoomHorizontal: 0
m_EnableSliderZoomVertical: 0
m_UniformScale: 1
@ -1099,9 +1099,9 @@ MonoBehaviour:
x: 0
y: 21
width: 607
height: 486
height: 460
m_Scale: {x: 1, y: 1}
m_Translation: {x: 303.5, y: 243}
m_Translation: {x: 303.5, y: 230}
m_MarginLeft: 0
m_MarginRight: 0
m_MarginTop: 0
@ -1109,12 +1109,12 @@ MonoBehaviour:
m_LastShownAreaInsideMargins:
serializedVersion: 2
x: -303.5
y: -243
y: -230
width: 607
height: 486
height: 460
m_MinimalGUI: 1
m_defaultScale: 1
m_LastWindowPixelSize: {x: 607, y: 507}
m_LastWindowPixelSize: {x: 607, y: 481}
m_ClearInEditMode: 1
m_NoCameraWarning: 1
m_LowResolutionForAspectRatios: 01000000000000000000