Skip to content

Commit b1d9e3b

Browse files
committed
Bug fix + Bump Unity version + Update copyright text
- Fixed a bug caused by inconsistent state check between managed and native object. - Bump Unity version. - Update copyright text
1 parent 613098c commit b1d9e3b

File tree

581 files changed

+739
-640
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

581 files changed

+739
-640
lines changed

Assets/Resources/PostProcessing/Pal3PostEffectDistortion.shader

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// ---------------------------------------------------------------------------------------------
2-
// Copyright (c) 2021-2024, Jiaqi (0x7c13) Liu. All rights reserved.
2+
// Copyright (c) 2021-2025, Jiaqi (0x7c13) Liu. All rights reserved.
33
// See LICENSE file in the project root for license information.
44
// ---------------------------------------------------------------------------------------------
55

Assets/Resources/Prefabs/Pal3.prefab

Lines changed: 27 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,7 @@ MonoBehaviour:
7878
m_DeselectOnBackgroundClick: 0
7979
m_PointerBehavior: 0
8080
m_CursorLockBehavior: 0
81+
m_ScrollDeltaPerTick: 6
8182
--- !u!1 &147356287
8283
GameObject:
8384
m_ObjectHideFlags: 0
@@ -258,6 +259,7 @@ AudioSource:
258259
serializedVersion: 4
259260
OutputAudioMixerGroup: {fileID: 0}
260261
m_audioClip: {fileID: 0}
262+
m_Resource: {fileID: 0}
261263
m_PlayOnAwake: 1
262264
m_Volume: 1
263265
m_Pitch: 1
@@ -1047,15 +1049,17 @@ MonoBehaviour:
10471049
m_lineSpacingMax: 0
10481050
m_paragraphSpacing: 0
10491051
m_charWidthMaxAdj: 0
1050-
m_enableWordWrapping: 1
1052+
m_TextWrappingMode: 1
10511053
m_wordWrappingRatios: 0.4
10521054
m_overflowMode: 0
10531055
m_linkedTextComponent: {fileID: 0}
10541056
parentLinkedComponent: {fileID: 0}
10551057
m_enableKerning: 1
1058+
m_ActiveFontFeatures: 6e72656b
10561059
m_enableExtraPadding: 0
10571060
checkPaddingRequired: 0
10581061
m_isRichText: 1
1062+
m_EmojiFallbackSupport: 1
10591063
m_parseCtrlCharacters: 1
10601064
m_isOrthographic: 1
10611065
m_isCullingEnabled: 0
@@ -1442,15 +1446,17 @@ MonoBehaviour:
14421446
m_lineSpacingMax: 0
14431447
m_paragraphSpacing: 0
14441448
m_charWidthMaxAdj: 0
1445-
m_enableWordWrapping: 1
1449+
m_TextWrappingMode: 1
14461450
m_wordWrappingRatios: 0.4
14471451
m_overflowMode: 0
14481452
m_linkedTextComponent: {fileID: 0}
14491453
parentLinkedComponent: {fileID: 0}
14501454
m_enableKerning: 1
1455+
m_ActiveFontFeatures: 6e72656b
14511456
m_enableExtraPadding: 0
14521457
checkPaddingRequired: 0
14531458
m_isRichText: 1
1459+
m_EmojiFallbackSupport: 1
14541460
m_parseCtrlCharacters: 1
14551461
m_isOrthographic: 1
14561462
m_isCullingEnabled: 0
@@ -1576,15 +1582,17 @@ MonoBehaviour:
15761582
m_lineSpacingMax: 0
15771583
m_paragraphSpacing: 0
15781584
m_charWidthMaxAdj: 0
1579-
m_enableWordWrapping: 1
1585+
m_TextWrappingMode: 1
15801586
m_wordWrappingRatios: 0.4
15811587
m_overflowMode: 0
15821588
m_linkedTextComponent: {fileID: 0}
15831589
parentLinkedComponent: {fileID: 0}
15841590
m_enableKerning: 1
1591+
m_ActiveFontFeatures: 6e72656b
15851592
m_enableExtraPadding: 0
15861593
checkPaddingRequired: 0
15871594
m_isRichText: 1
1595+
m_EmojiFallbackSupport: 1
15881596
m_parseCtrlCharacters: 1
15891597
m_isOrthographic: 1
15901598
m_isCullingEnabled: 0
@@ -2866,15 +2874,17 @@ MonoBehaviour:
28662874
m_lineSpacingMax: 0
28672875
m_paragraphSpacing: 0
28682876
m_charWidthMaxAdj: 0
2869-
m_enableWordWrapping: 1
2877+
m_TextWrappingMode: 1
28702878
m_wordWrappingRatios: 0.4
28712879
m_overflowMode: 0
28722880
m_linkedTextComponent: {fileID: 0}
28732881
parentLinkedComponent: {fileID: 0}
28742882
m_enableKerning: 1
2883+
m_ActiveFontFeatures: 6e72656b
28752884
m_enableExtraPadding: 0
28762885
checkPaddingRequired: 0
28772886
m_isRichText: 1
2887+
m_EmojiFallbackSupport: 1
28782888
m_parseCtrlCharacters: 1
28792889
m_isOrthographic: 1
28802890
m_isCullingEnabled: 0
@@ -3000,15 +3010,17 @@ MonoBehaviour:
30003010
m_lineSpacingMax: 0
30013011
m_paragraphSpacing: 0
30023012
m_charWidthMaxAdj: 0
3003-
m_enableWordWrapping: 1
3013+
m_TextWrappingMode: 1
30043014
m_wordWrappingRatios: 0.4
30053015
m_overflowMode: 0
30063016
m_linkedTextComponent: {fileID: 0}
30073017
parentLinkedComponent: {fileID: 0}
30083018
m_enableKerning: 1
3019+
m_ActiveFontFeatures: 6e72656b
30093020
m_enableExtraPadding: 0
30103021
checkPaddingRequired: 0
30113022
m_isRichText: 1
3023+
m_EmojiFallbackSupport: 1
30123024
m_parseCtrlCharacters: 1
30133025
m_isOrthographic: 1
30143026
m_isCullingEnabled: 0
@@ -4064,7 +4076,7 @@ MonoBehaviour:
40644076
m_PersistentCalls:
40654077
m_Calls: []
40664078
m_text: "https://github.com/0x7c13/Pal3.Unity B\u7AD9@\u67D2\u624D\nCopyright (c)
4067-
2021-2024, \u67D2\u624D(0x7c13). All rights reserved.\nCopyright (c) 2003, SOFTSTAR
4079+
2021-2025, \u67D2\u624D(0x7c13). All rights reserved.\nCopyright (c) 2003, SOFTSTAR
40684080
ENTERTAINMENT. All rights reserved."
40694081
m_isRightToLeft: 0
40704082
m_fontAsset: {fileID: 11400000, guid: 9e1d886e63529bb4ca3c95ece3e3189c, type: 2}
@@ -4108,15 +4120,17 @@ MonoBehaviour:
41084120
m_lineSpacingMax: 0
41094121
m_paragraphSpacing: 0
41104122
m_charWidthMaxAdj: 0
4111-
m_enableWordWrapping: 1
4123+
m_TextWrappingMode: 1
41124124
m_wordWrappingRatios: 0.4
41134125
m_overflowMode: 0
41144126
m_linkedTextComponent: {fileID: 0}
41154127
parentLinkedComponent: {fileID: 0}
41164128
m_enableKerning: 1
4129+
m_ActiveFontFeatures: 6e72656b
41174130
m_enableExtraPadding: 0
41184131
checkPaddingRequired: 0
41194132
m_isRichText: 1
4133+
m_EmojiFallbackSupport: 1
41204134
m_parseCtrlCharacters: 1
41214135
m_isOrthographic: 1
41224136
m_isCullingEnabled: 0
@@ -4786,15 +4800,17 @@ MonoBehaviour:
47864800
m_lineSpacingMax: 0
47874801
m_paragraphSpacing: 0
47884802
m_charWidthMaxAdj: 0
4789-
m_enableWordWrapping: 1
4803+
m_TextWrappingMode: 1
47904804
m_wordWrappingRatios: 0.4
47914805
m_overflowMode: 0
47924806
m_linkedTextComponent: {fileID: 0}
47934807
parentLinkedComponent: {fileID: 0}
47944808
m_enableKerning: 1
4809+
m_ActiveFontFeatures: 6e72656b
47954810
m_enableExtraPadding: 0
47964811
checkPaddingRequired: 0
47974812
m_isRichText: 1
4813+
m_EmojiFallbackSupport: 1
47984814
m_parseCtrlCharacters: 1
47994815
m_isOrthographic: 1
48004816
m_isCullingEnabled: 0
@@ -5265,15 +5281,17 @@ MonoBehaviour:
52655281
m_lineSpacingMax: 0
52665282
m_paragraphSpacing: 0
52675283
m_charWidthMaxAdj: 0
5268-
m_enableWordWrapping: 1
5284+
m_TextWrappingMode: 1
52695285
m_wordWrappingRatios: 0.4
52705286
m_overflowMode: 0
52715287
m_linkedTextComponent: {fileID: 0}
52725288
parentLinkedComponent: {fileID: 0}
52735289
m_enableKerning: 1
5290+
m_ActiveFontFeatures: 6e72656b
52745291
m_enableExtraPadding: 0
52755292
checkPaddingRequired: 0
52765293
m_isRichText: 1
5294+
m_EmojiFallbackSupport: 1
52775295
m_parseCtrlCharacters: 1
52785296
m_isOrthographic: 1
52795297
m_isCullingEnabled: 0

Assets/Resources/Shaders/Pal3Dev.shader

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// ---------------------------------------------------------------------------------------------
2-
// Copyright (c) 2021-2024, Jiaqi (0x7c13) Liu. All rights reserved.
2+
// Copyright (c) 2021-2025, Jiaqi (0x7c13) Liu. All rights reserved.
33
// See LICENSE file in the project root for license information.
44
// ---------------------------------------------------------------------------------------------
55

Assets/Resources/Shaders/Pal3Opaque.shader

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// ---------------------------------------------------------------------------------------------
2-
// Copyright (c) 2021-2024, Jiaqi (0x7c13) Liu. All rights reserved.
2+
// Copyright (c) 2021-2025, Jiaqi (0x7c13) Liu. All rights reserved.
33
// See LICENSE file in the project root for license information.
44
// ---------------------------------------------------------------------------------------------
55

Assets/Resources/Shaders/Pal3RoundedFrostedGlass.shader

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// ---------------------------------------------------------------------------------------------
2-
// Copyright (c) 2021-2024, Jiaqi (0x7c13) Liu. All rights reserved.
2+
// Copyright (c) 2021-2025, Jiaqi (0x7c13) Liu. All rights reserved.
33
// See LICENSE file in the project root for license information.
44
// ---------------------------------------------------------------------------------------------
55
// Based on cician's shader from https://forum.unity3d.com/threads/simple-optimized-blur-shader.185327/#post-1267642

Assets/Resources/Shaders/Pal3Snow.shader

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// ---------------------------------------------------------------------------------------------
2-
// Copyright (c) 2021-2024, Jiaqi (0x7c13) Liu. All rights reserved.
2+
// Copyright (c) 2021-2025, Jiaqi (0x7c13) Liu. All rights reserved.
33
// See LICENSE file in the project root for license information.
44
// ---------------------------------------------------------------------------------------------
55
// Based on https://www.shadertoy.com/view/4dl3R4

Assets/Resources/Shaders/Pal3Sprite.shader

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// ---------------------------------------------------------------------------------------------
2-
// Copyright (c) 2021-2024, Jiaqi (0x7c13) Liu. All rights reserved.
2+
// Copyright (c) 2021-2025, Jiaqi (0x7c13) Liu. All rights reserved.
33
// See LICENSE file in the project root for license information.
44
// ---------------------------------------------------------------------------------------------
55

Assets/Resources/Shaders/Pal3Transparent.shader

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// ---------------------------------------------------------------------------------------------
2-
// Copyright (c) 2021-2024, Jiaqi (0x7c13) Liu. All rights reserved.
2+
// Copyright (c) 2021-2025, Jiaqi (0x7c13) Liu. All rights reserved.
33
// See LICENSE file in the project root for license information.
44
// ---------------------------------------------------------------------------------------------
55

Assets/Resources/Shaders/Pal3TransparentOpaquePart.shader

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// ---------------------------------------------------------------------------------------------
2-
// Copyright (c) 2021-2024, Jiaqi (0x7c13) Liu. All rights reserved.
2+
// Copyright (c) 2021-2025, Jiaqi (0x7c13) Liu. All rights reserved.
33
// See LICENSE file in the project root for license information.
44
// ---------------------------------------------------------------------------------------------
55

Assets/Resources/Shaders/Pal3Water.shader

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// ---------------------------------------------------------------------------------------------
2-
// Copyright (c) 2021-2024, Jiaqi (0x7c13) Liu. All rights reserved.
2+
// Copyright (c) 2021-2025, Jiaqi (0x7c13) Liu. All rights reserved.
33
// See LICENSE file in the project root for license information.
44
// ---------------------------------------------------------------------------------------------
55

0 commit comments

Comments
 (0)