From d5e7b4f15161c45809b8fadb96ef9ea46972a068 Mon Sep 17 00:00:00 2001 From: fu-majime Date: Wed, 6 Mar 2024 11:18:55 +0900 Subject: [PATCH] comma --- .../Resources/Games/powerCalligraphy.prefab | 12 +- .../Animations/{ten.meta => comma.meta} | 0 .../fudePos-comma00.anim} | 2 +- .../fudePos-comma00.anim.meta} | 0 .../fudePos-comma01.anim} | 2 +- .../fudePos-comma01.anim.meta} | 0 .../fudePos-comma02-fast.anim} | 2 +- .../fudePos-comma02-fast.anim.meta} | 0 .../fudePos-comma02-just.anim} | 2 +- .../fudePos-comma02-just.anim.meta} | 0 .../fudePos-comma02-late.anim} | 2 +- .../fudePos-comma02-late.anim.meta} | 0 .../paper-comma00.anim} | 2 +- .../paper-comma00.anim.meta} | 0 .../paper-comma01-fast.anim} | 2 +- .../paper-comma01-fast.anim.meta} | 0 .../paper-comma01-just.anim} | 2 +- .../paper-comma01-just.anim.meta} | 0 .../paper-comma01-late.anim} | 2 +- .../paper-comma01-late.anim.meta} | 0 .../paper-comma02-end.anim} | 2 +- .../paper-comma02-end.anim.meta} | 0 .../Animations/fudePos.controller | 36 +- .../Animations/letter.controller | 34 +- .../PowerCalligraphy/{ten.png => comma.png} | Bin .../{ten.png.meta => comma.png.meta} | 0 .../PowerCalligraphy/{kao.png => face.png} | Bin .../{kao.png.meta => face.png.meta} | 0 .../{kao_kr.png => face_kr.png} | Bin .../{kao_kr.png.meta => face_kr.png.meta} | 0 .../Sprites/Games/PowerCalligraphy/fude-1.png | Bin 4170 -> 0 bytes .../Games/PowerCalligraphy/fude-1.png.meta | 145 -------- .../Games/PowerCalligraphy/fude.png.meta | 321 +++++++++++++----- .../PowerCalligraphy/PowerCalligraphy.cs | 40 ++- .../Scripts/Games/PowerCalligraphy/Writing.cs | 60 ++-- ...mes.Minigames.MinigameLoaderGenerator.g.cs | 10 + 36 files changed, 348 insertions(+), 330 deletions(-) rename Assets/Resources/Sprites/Games/PowerCalligraphy/Animations/{ten.meta => comma.meta} (100%) rename Assets/Resources/Sprites/Games/PowerCalligraphy/Animations/{ten/fudePos-ten00.anim => comma/fudePos-comma00.anim} (99%) rename Assets/Resources/Sprites/Games/PowerCalligraphy/Animations/{ten/fudePos-ten00.anim.meta => comma/fudePos-comma00.anim.meta} (100%) rename Assets/Resources/Sprites/Games/PowerCalligraphy/Animations/{ten/fudePos-ten01.anim => comma/fudePos-comma01.anim} (99%) rename Assets/Resources/Sprites/Games/PowerCalligraphy/Animations/{ten/fudePos-ten01.anim.meta => comma/fudePos-comma01.anim.meta} (100%) rename Assets/Resources/Sprites/Games/PowerCalligraphy/Animations/{ten/fudePos-ten02-fast.anim => comma/fudePos-comma02-fast.anim} (99%) rename Assets/Resources/Sprites/Games/PowerCalligraphy/Animations/{ten/fudePos-ten02-fast.anim.meta => comma/fudePos-comma02-fast.anim.meta} (100%) rename Assets/Resources/Sprites/Games/PowerCalligraphy/Animations/{ten/fudePos-ten02-just.anim => comma/fudePos-comma02-just.anim} (99%) rename Assets/Resources/Sprites/Games/PowerCalligraphy/Animations/{ten/fudePos-ten02-just.anim.meta => comma/fudePos-comma02-just.anim.meta} (100%) rename Assets/Resources/Sprites/Games/PowerCalligraphy/Animations/{ten/fudePos-ten02-late.anim => comma/fudePos-comma02-late.anim} (99%) rename Assets/Resources/Sprites/Games/PowerCalligraphy/Animations/{ten/fudePos-ten02-late.anim.meta => comma/fudePos-comma02-late.anim.meta} (100%) rename Assets/Resources/Sprites/Games/PowerCalligraphy/Animations/{ten/paper-ten00.anim => comma/paper-comma00.anim} (99%) rename Assets/Resources/Sprites/Games/PowerCalligraphy/Animations/{ten/paper-ten00.anim.meta => comma/paper-comma00.anim.meta} (100%) rename Assets/Resources/Sprites/Games/PowerCalligraphy/Animations/{ten/paper-ten01-fast.anim => comma/paper-comma01-fast.anim} (99%) rename Assets/Resources/Sprites/Games/PowerCalligraphy/Animations/{ten/paper-ten01-fast.anim.meta => comma/paper-comma01-fast.anim.meta} (100%) rename Assets/Resources/Sprites/Games/PowerCalligraphy/Animations/{ten/paper-ten01-just.anim => comma/paper-comma01-just.anim} (99%) rename Assets/Resources/Sprites/Games/PowerCalligraphy/Animations/{ten/paper-ten01-just.anim.meta => comma/paper-comma01-just.anim.meta} (100%) rename Assets/Resources/Sprites/Games/PowerCalligraphy/Animations/{ten/paper-ten01-late.anim => comma/paper-comma01-late.anim} (99%) rename Assets/Resources/Sprites/Games/PowerCalligraphy/Animations/{ten/paper-ten01-late.anim.meta => comma/paper-comma01-late.anim.meta} (100%) rename Assets/Resources/Sprites/Games/PowerCalligraphy/Animations/{ten/paper-ten02-end.anim => comma/paper-comma02-end.anim} (99%) rename Assets/Resources/Sprites/Games/PowerCalligraphy/Animations/{ten/paper-ten02-end.anim.meta => comma/paper-comma02-end.anim.meta} (100%) rename Assets/Resources/Sprites/Games/PowerCalligraphy/{ten.png => comma.png} (100%) rename Assets/Resources/Sprites/Games/PowerCalligraphy/{ten.png.meta => comma.png.meta} (100%) rename Assets/Resources/Sprites/Games/PowerCalligraphy/{kao.png => face.png} (100%) rename Assets/Resources/Sprites/Games/PowerCalligraphy/{kao.png.meta => face.png.meta} (100%) rename Assets/Resources/Sprites/Games/PowerCalligraphy/{kao_kr.png => face_kr.png} (100%) rename Assets/Resources/Sprites/Games/PowerCalligraphy/{kao_kr.png.meta => face_kr.png.meta} (100%) delete mode 100644 Assets/Resources/Sprites/Games/PowerCalligraphy/fude-1.png delete mode 100644 Assets/Resources/Sprites/Games/PowerCalligraphy/fude-1.png.meta diff --git a/Assets/Resources/Games/powerCalligraphy.prefab b/Assets/Resources/Games/powerCalligraphy.prefab index b2201fc27..0c506aae2 100644 --- a/Assets/Resources/Games/powerCalligraphy.prefab +++ b/Assets/Resources/Games/powerCalligraphy.prefab @@ -156,7 +156,7 @@ SpriteRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 10 + m_SortingOrder: 14 m_Sprite: {fileID: 2142888950, guid: 71b160e84f751d740a27198cdf4a4771, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 @@ -806,7 +806,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -0.03, y: 3.65, z: 0} m_LocalScale: {x: 2.1, y: 2.1, z: 2.1} - m_ConstrainProportionsScale: 1 + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 2609182281090089549} m_RootOrder: 0 @@ -852,12 +852,12 @@ SpriteRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 15 - m_Sprite: {fileID: -1824134705, guid: 4aa84d2ffe6f85b4eb45d80e768ba5be, type: 3} + m_Sprite: {fileID: 1419783882, guid: 71b160e84f751d740a27198cdf4a4771, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 m_FlipY: 0 - m_DrawMode: 0 - m_Size: {x: 0.55, y: 2.48} + m_DrawMode: 1 + m_Size: {x: 0.55, y: 2.5} m_AdaptiveModeThreshold: 0.5 m_SpriteTileMode: 0 m_WasSpriteAssigned: 1 @@ -1409,7 +1409,7 @@ GameObject: - component: {fileID: 624205592674416599} - component: {fileID: 7730938937389451918} m_Layer: 0 - m_Name: paper_ten + m_Name: paper_comma m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 diff --git a/Assets/Resources/Sprites/Games/PowerCalligraphy/Animations/ten.meta b/Assets/Resources/Sprites/Games/PowerCalligraphy/Animations/comma.meta similarity index 100% rename from Assets/Resources/Sprites/Games/PowerCalligraphy/Animations/ten.meta rename to Assets/Resources/Sprites/Games/PowerCalligraphy/Animations/comma.meta diff --git a/Assets/Resources/Sprites/Games/PowerCalligraphy/Animations/ten/fudePos-ten00.anim b/Assets/Resources/Sprites/Games/PowerCalligraphy/Animations/comma/fudePos-comma00.anim similarity index 99% rename from Assets/Resources/Sprites/Games/PowerCalligraphy/Animations/ten/fudePos-ten00.anim rename to Assets/Resources/Sprites/Games/PowerCalligraphy/Animations/comma/fudePos-comma00.anim index 85ef1426f..913f2c2d0 100644 --- a/Assets/Resources/Sprites/Games/PowerCalligraphy/Animations/ten/fudePos-ten00.anim +++ b/Assets/Resources/Sprites/Games/PowerCalligraphy/Animations/comma/fudePos-comma00.anim @@ -6,7 +6,7 @@ AnimationClip: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: fudePos-ten00 + m_Name: fudePos-comma00 serializedVersion: 6 m_Legacy: 0 m_Compressed: 0 diff --git a/Assets/Resources/Sprites/Games/PowerCalligraphy/Animations/ten/fudePos-ten00.anim.meta b/Assets/Resources/Sprites/Games/PowerCalligraphy/Animations/comma/fudePos-comma00.anim.meta similarity index 100% rename from Assets/Resources/Sprites/Games/PowerCalligraphy/Animations/ten/fudePos-ten00.anim.meta rename to Assets/Resources/Sprites/Games/PowerCalligraphy/Animations/comma/fudePos-comma00.anim.meta diff --git a/Assets/Resources/Sprites/Games/PowerCalligraphy/Animations/ten/fudePos-ten01.anim b/Assets/Resources/Sprites/Games/PowerCalligraphy/Animations/comma/fudePos-comma01.anim similarity index 99% rename from Assets/Resources/Sprites/Games/PowerCalligraphy/Animations/ten/fudePos-ten01.anim rename to Assets/Resources/Sprites/Games/PowerCalligraphy/Animations/comma/fudePos-comma01.anim index 490591631..3b3d9b5d9 100644 --- a/Assets/Resources/Sprites/Games/PowerCalligraphy/Animations/ten/fudePos-ten01.anim +++ b/Assets/Resources/Sprites/Games/PowerCalligraphy/Animations/comma/fudePos-comma01.anim @@ -6,7 +6,7 @@ AnimationClip: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: fudePos-ten01 + m_Name: fudePos-comma01 serializedVersion: 6 m_Legacy: 0 m_Compressed: 0 diff --git a/Assets/Resources/Sprites/Games/PowerCalligraphy/Animations/ten/fudePos-ten01.anim.meta b/Assets/Resources/Sprites/Games/PowerCalligraphy/Animations/comma/fudePos-comma01.anim.meta similarity index 100% rename from Assets/Resources/Sprites/Games/PowerCalligraphy/Animations/ten/fudePos-ten01.anim.meta rename to Assets/Resources/Sprites/Games/PowerCalligraphy/Animations/comma/fudePos-comma01.anim.meta diff --git a/Assets/Resources/Sprites/Games/PowerCalligraphy/Animations/ten/fudePos-ten02-fast.anim b/Assets/Resources/Sprites/Games/PowerCalligraphy/Animations/comma/fudePos-comma02-fast.anim similarity index 99% rename from Assets/Resources/Sprites/Games/PowerCalligraphy/Animations/ten/fudePos-ten02-fast.anim rename to Assets/Resources/Sprites/Games/PowerCalligraphy/Animations/comma/fudePos-comma02-fast.anim index b2dfdddfa..f126bcbea 100644 --- a/Assets/Resources/Sprites/Games/PowerCalligraphy/Animations/ten/fudePos-ten02-fast.anim +++ b/Assets/Resources/Sprites/Games/PowerCalligraphy/Animations/comma/fudePos-comma02-fast.anim @@ -6,7 +6,7 @@ AnimationClip: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: fudePos-ten02-fast + m_Name: fudePos-comma02-fast serializedVersion: 6 m_Legacy: 0 m_Compressed: 0 diff --git a/Assets/Resources/Sprites/Games/PowerCalligraphy/Animations/ten/fudePos-ten02-fast.anim.meta b/Assets/Resources/Sprites/Games/PowerCalligraphy/Animations/comma/fudePos-comma02-fast.anim.meta similarity index 100% rename from Assets/Resources/Sprites/Games/PowerCalligraphy/Animations/ten/fudePos-ten02-fast.anim.meta rename to Assets/Resources/Sprites/Games/PowerCalligraphy/Animations/comma/fudePos-comma02-fast.anim.meta diff --git a/Assets/Resources/Sprites/Games/PowerCalligraphy/Animations/ten/fudePos-ten02-just.anim b/Assets/Resources/Sprites/Games/PowerCalligraphy/Animations/comma/fudePos-comma02-just.anim similarity index 99% rename from Assets/Resources/Sprites/Games/PowerCalligraphy/Animations/ten/fudePos-ten02-just.anim rename to Assets/Resources/Sprites/Games/PowerCalligraphy/Animations/comma/fudePos-comma02-just.anim index 573eb434f..733e0984e 100644 --- a/Assets/Resources/Sprites/Games/PowerCalligraphy/Animations/ten/fudePos-ten02-just.anim +++ b/Assets/Resources/Sprites/Games/PowerCalligraphy/Animations/comma/fudePos-comma02-just.anim @@ -6,7 +6,7 @@ AnimationClip: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: fudePos-ten02-just + m_Name: fudePos-comma02-just serializedVersion: 6 m_Legacy: 0 m_Compressed: 0 diff --git a/Assets/Resources/Sprites/Games/PowerCalligraphy/Animations/ten/fudePos-ten02-just.anim.meta b/Assets/Resources/Sprites/Games/PowerCalligraphy/Animations/comma/fudePos-comma02-just.anim.meta similarity index 100% rename from Assets/Resources/Sprites/Games/PowerCalligraphy/Animations/ten/fudePos-ten02-just.anim.meta rename to Assets/Resources/Sprites/Games/PowerCalligraphy/Animations/comma/fudePos-comma02-just.anim.meta diff --git a/Assets/Resources/Sprites/Games/PowerCalligraphy/Animations/ten/fudePos-ten02-late.anim b/Assets/Resources/Sprites/Games/PowerCalligraphy/Animations/comma/fudePos-comma02-late.anim similarity index 99% rename from Assets/Resources/Sprites/Games/PowerCalligraphy/Animations/ten/fudePos-ten02-late.anim rename to Assets/Resources/Sprites/Games/PowerCalligraphy/Animations/comma/fudePos-comma02-late.anim index 56a0543e0..c24f9f865 100644 --- a/Assets/Resources/Sprites/Games/PowerCalligraphy/Animations/ten/fudePos-ten02-late.anim +++ b/Assets/Resources/Sprites/Games/PowerCalligraphy/Animations/comma/fudePos-comma02-late.anim @@ -6,7 +6,7 @@ AnimationClip: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: fudePos-ten02-late + m_Name: fudePos-comma02-late serializedVersion: 6 m_Legacy: 0 m_Compressed: 0 diff --git a/Assets/Resources/Sprites/Games/PowerCalligraphy/Animations/ten/fudePos-ten02-late.anim.meta b/Assets/Resources/Sprites/Games/PowerCalligraphy/Animations/comma/fudePos-comma02-late.anim.meta similarity index 100% rename from Assets/Resources/Sprites/Games/PowerCalligraphy/Animations/ten/fudePos-ten02-late.anim.meta rename to Assets/Resources/Sprites/Games/PowerCalligraphy/Animations/comma/fudePos-comma02-late.anim.meta diff --git a/Assets/Resources/Sprites/Games/PowerCalligraphy/Animations/ten/paper-ten00.anim b/Assets/Resources/Sprites/Games/PowerCalligraphy/Animations/comma/paper-comma00.anim similarity index 99% rename from Assets/Resources/Sprites/Games/PowerCalligraphy/Animations/ten/paper-ten00.anim rename to Assets/Resources/Sprites/Games/PowerCalligraphy/Animations/comma/paper-comma00.anim index 2ff6d5dc6..b411bf91b 100644 --- a/Assets/Resources/Sprites/Games/PowerCalligraphy/Animations/ten/paper-ten00.anim +++ b/Assets/Resources/Sprites/Games/PowerCalligraphy/Animations/comma/paper-comma00.anim @@ -6,7 +6,7 @@ AnimationClip: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: paper-ten00 + m_Name: paper-comma00 serializedVersion: 6 m_Legacy: 0 m_Compressed: 0 diff --git a/Assets/Resources/Sprites/Games/PowerCalligraphy/Animations/ten/paper-ten00.anim.meta b/Assets/Resources/Sprites/Games/PowerCalligraphy/Animations/comma/paper-comma00.anim.meta similarity index 100% rename from Assets/Resources/Sprites/Games/PowerCalligraphy/Animations/ten/paper-ten00.anim.meta rename to Assets/Resources/Sprites/Games/PowerCalligraphy/Animations/comma/paper-comma00.anim.meta diff --git a/Assets/Resources/Sprites/Games/PowerCalligraphy/Animations/ten/paper-ten01-fast.anim b/Assets/Resources/Sprites/Games/PowerCalligraphy/Animations/comma/paper-comma01-fast.anim similarity index 99% rename from Assets/Resources/Sprites/Games/PowerCalligraphy/Animations/ten/paper-ten01-fast.anim rename to Assets/Resources/Sprites/Games/PowerCalligraphy/Animations/comma/paper-comma01-fast.anim index 2a1b554c6..c9654cf13 100644 --- a/Assets/Resources/Sprites/Games/PowerCalligraphy/Animations/ten/paper-ten01-fast.anim +++ b/Assets/Resources/Sprites/Games/PowerCalligraphy/Animations/comma/paper-comma01-fast.anim @@ -6,7 +6,7 @@ AnimationClip: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: paper-ten01-fast + m_Name: paper-comma01-fast serializedVersion: 6 m_Legacy: 0 m_Compressed: 0 diff --git a/Assets/Resources/Sprites/Games/PowerCalligraphy/Animations/ten/paper-ten01-fast.anim.meta b/Assets/Resources/Sprites/Games/PowerCalligraphy/Animations/comma/paper-comma01-fast.anim.meta similarity index 100% rename from Assets/Resources/Sprites/Games/PowerCalligraphy/Animations/ten/paper-ten01-fast.anim.meta rename to Assets/Resources/Sprites/Games/PowerCalligraphy/Animations/comma/paper-comma01-fast.anim.meta diff --git a/Assets/Resources/Sprites/Games/PowerCalligraphy/Animations/ten/paper-ten01-just.anim b/Assets/Resources/Sprites/Games/PowerCalligraphy/Animations/comma/paper-comma01-just.anim similarity index 99% rename from Assets/Resources/Sprites/Games/PowerCalligraphy/Animations/ten/paper-ten01-just.anim rename to Assets/Resources/Sprites/Games/PowerCalligraphy/Animations/comma/paper-comma01-just.anim index 111410318..a634c22d0 100644 --- a/Assets/Resources/Sprites/Games/PowerCalligraphy/Animations/ten/paper-ten01-just.anim +++ b/Assets/Resources/Sprites/Games/PowerCalligraphy/Animations/comma/paper-comma01-just.anim @@ -6,7 +6,7 @@ AnimationClip: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: paper-ten01-just + m_Name: paper-comma01-just serializedVersion: 6 m_Legacy: 0 m_Compressed: 0 diff --git a/Assets/Resources/Sprites/Games/PowerCalligraphy/Animations/ten/paper-ten01-just.anim.meta b/Assets/Resources/Sprites/Games/PowerCalligraphy/Animations/comma/paper-comma01-just.anim.meta similarity index 100% rename from Assets/Resources/Sprites/Games/PowerCalligraphy/Animations/ten/paper-ten01-just.anim.meta rename to Assets/Resources/Sprites/Games/PowerCalligraphy/Animations/comma/paper-comma01-just.anim.meta diff --git a/Assets/Resources/Sprites/Games/PowerCalligraphy/Animations/ten/paper-ten01-late.anim b/Assets/Resources/Sprites/Games/PowerCalligraphy/Animations/comma/paper-comma01-late.anim similarity index 99% rename from Assets/Resources/Sprites/Games/PowerCalligraphy/Animations/ten/paper-ten01-late.anim rename to Assets/Resources/Sprites/Games/PowerCalligraphy/Animations/comma/paper-comma01-late.anim index 7d0493f7c..8eba81fe3 100644 --- a/Assets/Resources/Sprites/Games/PowerCalligraphy/Animations/ten/paper-ten01-late.anim +++ b/Assets/Resources/Sprites/Games/PowerCalligraphy/Animations/comma/paper-comma01-late.anim @@ -6,7 +6,7 @@ AnimationClip: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: paper-ten01-late + m_Name: paper-comma01-late serializedVersion: 6 m_Legacy: 0 m_Compressed: 0 diff --git a/Assets/Resources/Sprites/Games/PowerCalligraphy/Animations/ten/paper-ten01-late.anim.meta b/Assets/Resources/Sprites/Games/PowerCalligraphy/Animations/comma/paper-comma01-late.anim.meta similarity index 100% rename from Assets/Resources/Sprites/Games/PowerCalligraphy/Animations/ten/paper-ten01-late.anim.meta rename to Assets/Resources/Sprites/Games/PowerCalligraphy/Animations/comma/paper-comma01-late.anim.meta diff --git a/Assets/Resources/Sprites/Games/PowerCalligraphy/Animations/ten/paper-ten02-end.anim b/Assets/Resources/Sprites/Games/PowerCalligraphy/Animations/comma/paper-comma02-end.anim similarity index 99% rename from Assets/Resources/Sprites/Games/PowerCalligraphy/Animations/ten/paper-ten02-end.anim rename to Assets/Resources/Sprites/Games/PowerCalligraphy/Animations/comma/paper-comma02-end.anim index 485dd3faa..e4ac2a725 100644 --- a/Assets/Resources/Sprites/Games/PowerCalligraphy/Animations/ten/paper-ten02-end.anim +++ b/Assets/Resources/Sprites/Games/PowerCalligraphy/Animations/comma/paper-comma02-end.anim @@ -6,7 +6,7 @@ AnimationClip: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: paper-ten02-end + m_Name: paper-comma02-end serializedVersion: 6 m_Legacy: 0 m_Compressed: 0 diff --git a/Assets/Resources/Sprites/Games/PowerCalligraphy/Animations/ten/paper-ten02-end.anim.meta b/Assets/Resources/Sprites/Games/PowerCalligraphy/Animations/comma/paper-comma02-end.anim.meta similarity index 100% rename from Assets/Resources/Sprites/Games/PowerCalligraphy/Animations/ten/paper-ten02-end.anim.meta rename to Assets/Resources/Sprites/Games/PowerCalligraphy/Animations/comma/paper-comma02-end.anim.meta diff --git a/Assets/Resources/Sprites/Games/PowerCalligraphy/Animations/fudePos.controller b/Assets/Resources/Sprites/Games/PowerCalligraphy/Animations/fudePos.controller index 3c5c31482..500d98613 100644 --- a/Assets/Resources/Sprites/Games/PowerCalligraphy/Animations/fudePos.controller +++ b/Assets/Resources/Sprites/Games/PowerCalligraphy/Animations/fudePos.controller @@ -7,7 +7,7 @@ AnimatorState: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: fudePos-ten02-miss + m_Name: fudePos-comma02-miss m_Speed: 1 m_CycleOffset: 0 m_Transitions: [] @@ -33,7 +33,7 @@ AnimatorState: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: fudePos-ten00 + m_Name: fudePos-comma00 m_Speed: 1 m_CycleOffset: 0 m_Transitions: [] @@ -118,40 +118,40 @@ AnimatorStateMachine: m_Position: {x: 200, y: 0, z: 0} - serializedVersion: 1 m_State: {fileID: 2918795362906277945} - m_Position: {x: 30, y: 260, z: 0} + m_Position: {x: 370, y: 260, z: 0} - serializedVersion: 1 m_State: {fileID: -8570468295486733057} - m_Position: {x: 80, y: 330, z: 0} + m_Position: {x: 420, y: 330, z: 0} - serializedVersion: 1 m_State: {fileID: 3260831569143889301} - m_Position: {x: 80, y: 400, z: 0} + m_Position: {x: 420, y: 400, z: 0} - serializedVersion: 1 m_State: {fileID: 5882042523823724615} - m_Position: {x: 80, y: 470, z: 0} + m_Position: {x: 420, y: 470, z: 0} - serializedVersion: 1 m_State: {fileID: -2898621561750013274} - m_Position: {x: 80, y: 540, z: 0} + m_Position: {x: 420, y: 540, z: 0} - serializedVersion: 1 m_State: {fileID: -8184168049185127996} - m_Position: {x: 0, y: 200, z: 0} + m_Position: {x: 340, y: 200, z: 0} - serializedVersion: 1 m_State: {fileID: -3989720767082847083} - m_Position: {x: 400, y: 200, z: 0} + m_Position: {x: 0, y: 200, z: 0} - serializedVersion: 1 m_State: {fileID: 6893683294278431745} - m_Position: {x: 430, y: 270, z: 0} + m_Position: {x: 30, y: 270, z: 0} - serializedVersion: 1 m_State: {fileID: -7695259267961688207} - m_Position: {x: 470, y: 330, z: 0} + m_Position: {x: 70, y: 330, z: 0} - serializedVersion: 1 m_State: {fileID: 5989796956022979887} - m_Position: {x: 500, y: 400, z: 0} + m_Position: {x: 100, y: 400, z: 0} - serializedVersion: 1 m_State: {fileID: -1920335506474462021} - m_Position: {x: 510, y: 460, z: 0} + m_Position: {x: 110, y: 460, z: 0} - serializedVersion: 1 m_State: {fileID: -6544540281406755334} - m_Position: {x: 510, y: 530, z: 0} + m_Position: {x: 110, y: 530, z: 0} m_ChildStateMachines: [] m_AnyStateTransitions: [] m_EntryTransitions: [] @@ -195,7 +195,7 @@ AnimatorState: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: fudePos-ten02-late + m_Name: fudePos-comma02-late m_Speed: 1 m_CycleOffset: 0 m_Transitions: [] @@ -295,7 +295,7 @@ AnimatorState: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: fudePos-ten01 + m_Name: fudePos-comma01 m_Speed: 1 m_CycleOffset: 0 m_Transitions: [] @@ -321,7 +321,7 @@ AnimatorState: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: fudePos-ten02-fast + m_Name: fudePos-comma02-fast m_Speed: 1 m_CycleOffset: 0 m_Transitions: [] @@ -347,7 +347,7 @@ AnimatorState: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: fudePos-ten02-just + m_Name: fudePos-comma02-just m_Speed: 1 m_CycleOffset: 0 m_Transitions: [] diff --git a/Assets/Resources/Sprites/Games/PowerCalligraphy/Animations/letter.controller b/Assets/Resources/Sprites/Games/PowerCalligraphy/Animations/letter.controller index cc9c4fc25..f8e56f6db 100644 --- a/Assets/Resources/Sprites/Games/PowerCalligraphy/Animations/letter.controller +++ b/Assets/Resources/Sprites/Games/PowerCalligraphy/Animations/letter.controller @@ -92,40 +92,40 @@ AnimatorStateMachine: m_Position: {x: 260, y: 20, z: 0} - serializedVersion: 1 m_State: {fileID: 8786292936139707480} - m_Position: {x: 30, y: 260, z: 0} + m_Position: {x: 440, y: 280, z: 0} - serializedVersion: 1 m_State: {fileID: -2809595864687422053} - m_Position: {x: 0, y: 190, z: 0} + m_Position: {x: 410, y: 210, z: 0} - serializedVersion: 1 m_State: {fileID: 2652860380271456673} - m_Position: {x: 30, y: 320, z: 0} + m_Position: {x: 440, y: 340, z: 0} - serializedVersion: 1 m_State: {fileID: -2749694015844619861} - m_Position: {x: 30, y: 380, z: 0} + m_Position: {x: 440, y: 400, z: 0} - serializedVersion: 1 m_State: {fileID: 8108316008410973255} - m_Position: {x: 70, y: 440, z: 0} + m_Position: {x: 480, y: 460, z: 0} - serializedVersion: 1 m_State: {fileID: 3351064918583297504} - m_Position: {x: 300, y: 200, z: 0} + m_Position: {x: 0, y: 200, z: 0} - serializedVersion: 1 m_State: {fileID: -6284373825970273870} - m_Position: {x: 330, y: 270, z: 0} + m_Position: {x: 30, y: 270, z: 0} - serializedVersion: 1 m_State: {fileID: -4515971188078934360} - m_Position: {x: 370, y: 330, z: 0} + m_Position: {x: 70, y: 330, z: 0} - serializedVersion: 1 m_State: {fileID: -9028063261873104851} - m_Position: {x: 400, y: 400, z: 0} + m_Position: {x: 100, y: 400, z: 0} - serializedVersion: 1 m_State: {fileID: 3061722880113446351} - m_Position: {x: 400, y: 460, z: 0} + m_Position: {x: 100, y: 460, z: 0} - serializedVersion: 1 m_State: {fileID: 4964938421491347055} - m_Position: {x: 400, y: 520, z: 0} + m_Position: {x: 100, y: 520, z: 0} - serializedVersion: 1 m_State: {fileID: 5375773717256993161} - m_Position: {x: 500, y: 580, z: 0} + m_Position: {x: 200, y: 580, z: 0} m_ChildStateMachines: [] m_AnyStateTransitions: [] m_EntryTransitions: [] @@ -169,7 +169,7 @@ AnimatorState: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: paper-ten00 + m_Name: paper-comma00 m_Speed: 1 m_CycleOffset: 0 m_Transitions: [] @@ -195,7 +195,7 @@ AnimatorState: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: paper-ten01-late + m_Name: paper-comma01-late m_Speed: 1 m_CycleOffset: 0 m_Transitions: [] @@ -243,7 +243,7 @@ AnimatorState: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: paper-ten01-fast + m_Name: paper-comma01-fast m_Speed: 1 m_CycleOffset: 0 m_Transitions: [] @@ -373,7 +373,7 @@ AnimatorState: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: paper-ten02-end + m_Name: paper-comma02-end m_Speed: 1 m_CycleOffset: 0 m_Transitions: [] @@ -399,7 +399,7 @@ AnimatorState: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: paper-ten01-just + m_Name: paper-comma01-just m_Speed: 1 m_CycleOffset: 0 m_Transitions: [] diff --git a/Assets/Resources/Sprites/Games/PowerCalligraphy/ten.png b/Assets/Resources/Sprites/Games/PowerCalligraphy/comma.png similarity index 100% rename from Assets/Resources/Sprites/Games/PowerCalligraphy/ten.png rename to Assets/Resources/Sprites/Games/PowerCalligraphy/comma.png diff --git a/Assets/Resources/Sprites/Games/PowerCalligraphy/ten.png.meta b/Assets/Resources/Sprites/Games/PowerCalligraphy/comma.png.meta similarity index 100% rename from Assets/Resources/Sprites/Games/PowerCalligraphy/ten.png.meta rename to Assets/Resources/Sprites/Games/PowerCalligraphy/comma.png.meta diff --git a/Assets/Resources/Sprites/Games/PowerCalligraphy/kao.png b/Assets/Resources/Sprites/Games/PowerCalligraphy/face.png similarity index 100% rename from Assets/Resources/Sprites/Games/PowerCalligraphy/kao.png rename to Assets/Resources/Sprites/Games/PowerCalligraphy/face.png diff --git a/Assets/Resources/Sprites/Games/PowerCalligraphy/kao.png.meta b/Assets/Resources/Sprites/Games/PowerCalligraphy/face.png.meta similarity index 100% rename from Assets/Resources/Sprites/Games/PowerCalligraphy/kao.png.meta rename to Assets/Resources/Sprites/Games/PowerCalligraphy/face.png.meta diff --git a/Assets/Resources/Sprites/Games/PowerCalligraphy/kao_kr.png b/Assets/Resources/Sprites/Games/PowerCalligraphy/face_kr.png similarity index 100% rename from Assets/Resources/Sprites/Games/PowerCalligraphy/kao_kr.png rename to Assets/Resources/Sprites/Games/PowerCalligraphy/face_kr.png diff --git a/Assets/Resources/Sprites/Games/PowerCalligraphy/kao_kr.png.meta b/Assets/Resources/Sprites/Games/PowerCalligraphy/face_kr.png.meta similarity index 100% rename from Assets/Resources/Sprites/Games/PowerCalligraphy/kao_kr.png.meta rename to Assets/Resources/Sprites/Games/PowerCalligraphy/face_kr.png.meta diff --git a/Assets/Resources/Sprites/Games/PowerCalligraphy/fude-1.png b/Assets/Resources/Sprites/Games/PowerCalligraphy/fude-1.png deleted file mode 100644 index 06e3817f4c6f949d5cb4069e5c1adb633fb19113..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4170 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 mV9n8<() { - new GameAction("write", "Write") + new GameAction("re", "Re (レ)") { - preFunction = delegate {var e = eventCaller.currentEntity; PowerCalligraphy.instance.QueuePaper(e.beat, e["type"], e["prepare"]); }, - function = delegate {var e = eventCaller.currentEntity; PowerCalligraphy.instance.Write(e.beat, e["type"]); }, + preFunction = delegate {var e = eventCaller.currentEntity; PowerCalligraphy.instance.QueuePaper(e.beat, (int)PowerCalligraphy.LetterType.re, e["prepare"]); }, + function = delegate {var e = eventCaller.currentEntity; PowerCalligraphy.instance.Write(e.beat, (int)PowerCalligraphy.LetterType.re); }, parameters = new List() { - new Param("type", PowerCalligraphy.LetterType.re, "Type", "Choose the letter to write."), new Param("prepare", false, "Force Prepare", "Toggle if the cue should be prepared."), }, defaultLength = 8f, }, + new GameAction("comma", "Comma (、)") + { + preFunction = delegate {var e = eventCaller.currentEntity; PowerCalligraphy.instance.QueuePaper(e.beat, (int)PowerCalligraphy.LetterType.comma, e["prepare"]); }, + function = delegate {var e = eventCaller.currentEntity; PowerCalligraphy.instance.Write(e.beat, (int)PowerCalligraphy.LetterType.comma); }, + parameters = new List() + { + new Param("prepare", false, "Force Prepare", "Toggle if the cue should be prepared."), + }, + defaultLength = 8f, + }, + // new GameAction("write", "Write") + // { + // preFunction = delegate {var e = eventCaller.currentEntity; PowerCalligraphy.instance.QueuePaper(e.beat, e["type"], e["prepare"]); }, + // function = delegate {var e = eventCaller.currentEntity; PowerCalligraphy.instance.Write(e.beat, e["type"]); }, + // parameters = new List() + // { + // new Param("type", PowerCalligraphy.LetterType.re, "Type", "Choose the letter to write."), + // new Param("prepare", false, "Force Prepare", "Toggle if the cue should be prepared."), + // }, + // defaultLength = 8f, + // }, }, new List() { "agb", "normal" }, "agbCalligraphy", "en", new List() { } ); @@ -53,13 +73,13 @@ namespace HeavenStudio.Games public enum LetterType { re, - ten, + comma, chikara, onore, sun, kokoro, - tsurunihamushi, - tsurunihamushi_korean, + face, + face_korean, } public struct QueuedPaper { @@ -139,13 +159,13 @@ namespace HeavenStudio.Games SpawnPaper(beat, type); fudePosAnim.Play(type switch { (int)LetterType.re => "fudePos-re00", - (int)LetterType.ten => "fudePos-ten00", + (int)LetterType.comma => "fudePos-comma00", (int)LetterType.chikara => "fudePos-chikara00", (int)LetterType.onore => "fudePos-onore00", (int)LetterType.sun => "fudePos-sun00", (int)LetterType.kokoro => "fudePos-kokoro00", - (int)LetterType.tsurunihamushi => "fudePos-tsurunihamushi00", - (int)LetterType.tsurunihamushi_korean => "fudePos-tsurunihamushi_kr00", + (int)LetterType.face => "fudePos-face00", + (int)LetterType.face_korean => "fudePos-face_kr00", }); isPrepare = true; } diff --git a/Assets/Scripts/Games/PowerCalligraphy/Writing.cs b/Assets/Scripts/Games/PowerCalligraphy/Writing.cs index b0120adc6..7bbd1a458 100644 --- a/Assets/Scripts/Games/PowerCalligraphy/Writing.cs +++ b/Assets/Scripts/Games/PowerCalligraphy/Writing.cs @@ -13,13 +13,13 @@ namespace HeavenStudio.Games.Scripts_PowerCalligraphy public enum LetterType { re, - ten, + comma, chikara, onore, sun, kokoro, - tsurunihamushi, - tsurunihamushi_korean, + face, + face_korean, } public double targetBeat; @@ -43,13 +43,13 @@ namespace HeavenStudio.Games.Scripts_PowerCalligraphy paperAnim.Play(type switch { (int)LetterType.re => "paper-re00", - (int)LetterType.ten => "paper-ten00", + (int)LetterType.comma => "paper-comma00", (int)LetterType.chikara => "paper-chikara00", (int)LetterType.onore => "paper-onore00", (int)LetterType.sun => "paper-sun00", (int)LetterType.kokoro => "paper-kokoro00", - (int)LetterType.tsurunihamushi => "paper-tsurunihamushi00", - (int)LetterType.tsurunihamushi_korean => "paper-tsurunihamushi_kr00", + (int)LetterType.face => "paper-face00", + (int)LetterType.face_korean => "paper-face_kr00", }); } @@ -95,7 +95,7 @@ namespace HeavenStudio.Games.Scripts_PowerCalligraphy game.ScheduleInput(targetBeat+4f, 2f, PowerCalligraphy.InputAction_BasicPress, writeSuccess, writeMiss, Empty, CanSuccess); break; - case (int)LetterType.ten: + case (int)LetterType.comma: MultiSound.Play(new MultiSound.Sound[] { new MultiSound.Sound("powerCalligraphy/comma1", targetBeat), @@ -108,14 +108,14 @@ namespace HeavenStudio.Games.Scripts_PowerCalligraphy new BeatAction.Action(targetBeat, delegate { fudeAnim.DoScaledAnimationAsync("fude-prepare", 0.5f);}), new BeatAction.Action(targetBeat+2f, delegate { fudeAnim.DoScaledAnimationAsync("fude-prepare", 0.5f);}), new BeatAction.Action(targetBeat+3f, delegate { fudeAnim.DoScaledAnimationAsync("fude-prepare", 0.5f);}), - new BeatAction.Action(targetBeat+4f, delegate { fudePosAnim.DoScaledAnimationAsync("fudePos-ten01", 0.5f);}), + new BeatAction.Action(targetBeat+4f, delegate { fudePosAnim.DoScaledAnimationAsync("fudePos-comma01", 0.5f);}), new BeatAction.Action(targetBeat+5f, delegate { onGoing = true; fudeAnim.DoScaledAnimationAsync("fude-pause", 0.5f); releaseSound = SoundByte.PlayOneShotGame("powerCalligraphy/releaseB1", forcePlay: true); }), - new BeatAction.Action(targetBeat+6f, delegate { paperAnim.Play("paper-ten02-end");}), + new BeatAction.Action(targetBeat+6f, delegate { paperAnim.Play("paper-comma02-end");}), new BeatAction.Action(targetBeat+7f, delegate { isEnd = true; @@ -245,7 +245,7 @@ namespace HeavenStudio.Games.Scripts_PowerCalligraphy game.ScheduleInput(targetBeat+5f, 1f, PowerCalligraphy.InputAction_BasicPress, writeSuccess, writeMiss, Empty, CanSuccess); break; - case (int)LetterType.tsurunihamushi: + case (int)LetterType.face: MultiSound.Play(new MultiSound.Sound[] { new MultiSound.Sound("powerCalligraphy/brush1", targetBeat), @@ -280,7 +280,7 @@ namespace HeavenStudio.Games.Scripts_PowerCalligraphy game.ScheduleInput(targetBeat+8f, 2f, PowerCalligraphy.InputAction_BasicPress, writeSuccess, writeMiss, Empty, CanSuccess); break; - case (int)LetterType.tsurunihamushi_korean: + case (int)LetterType.face_korean: MultiSound.Play(new MultiSound.Sound[] { new MultiSound.Sound("powerCalligraphy/brush1", targetBeat), @@ -352,10 +352,10 @@ namespace HeavenStudio.Games.Scripts_PowerCalligraphy SoundByte.PlayOneShotGame("powerCalligraphy/releaseA2"); break; - case (int)LetterType.ten: + case (int)LetterType.comma: fudeAnim.DoScaledAnimationAsync("fude-tap", 0.5f); - paperAnim.Play("paper-ten01-just"); - fudePosAnim.DoScaledAnimationAsync("fudePos-ten02-just", 0.5f); + paperAnim.Play("paper-comma01-just"); + fudePosAnim.DoScaledAnimationAsync("fudePos-comma02-just", 0.5f); SoundByte.PlayOneShotGame("powerCalligraphy/releaseB2"); break; @@ -383,11 +383,11 @@ namespace HeavenStudio.Games.Scripts_PowerCalligraphy } break; - case (int)LetterType.tsurunihamushi: + case (int)LetterType.face: SoundByte.PlayOneShotGame("powerCalligraphy/releaseA2"); break; - case (int)LetterType.tsurunihamushi_korean: + case (int)LetterType.face_korean: SoundByte.PlayOneShotGame("powerCalligraphy/releaseA2"); break; } @@ -403,9 +403,9 @@ namespace HeavenStudio.Games.Scripts_PowerCalligraphy SoundByte.PlayOneShotGame("powerCalligraphy/6"); // WIP HANE-miss? break; - case (int)LetterType.ten: - paperAnim.Play("paper-ten01-late"); - fudePosAnim.DoScaledAnimationAsync("fudePos-ten02-late", 0.5f); + case (int)LetterType.comma: + paperAnim.Play("paper-comma01-late"); + fudePosAnim.DoScaledAnimationAsync("fudePos-comma02-late", 0.5f); SoundByte.PlayOneShotGame("powerCalligraphy/8"); // WIP TOME-miss? break; @@ -423,11 +423,11 @@ namespace HeavenStudio.Games.Scripts_PowerCalligraphy case (int)LetterType.kokoro: break; - case (int)LetterType.tsurunihamushi: + case (int)LetterType.face: SoundByte.PlayOneShotGame("powerCalligraphy/9"); // WIP HARAI-miss? break; - case (int)LetterType.tsurunihamushi_korean: + case (int)LetterType.face_korean: SoundByte.PlayOneShotGame("powerCalligraphy/9"); // WIP HARAI-miss? break; } @@ -443,9 +443,9 @@ namespace HeavenStudio.Games.Scripts_PowerCalligraphy SoundByte.PlayOneShotGame("powerCalligraphy/6"); // WIP HANE-miss? break; - case (int)LetterType.ten: - paperAnim.Play("paper-ten01-fast"); - fudePosAnim.DoScaledAnimationAsync("fudePos-ten02-fast", 0.5f); + case (int)LetterType.comma: + paperAnim.Play("paper-comma01-fast"); + fudePosAnim.DoScaledAnimationAsync("fudePos-comma02-fast", 0.5f); SoundByte.PlayOneShotGame("powerCalligraphy/8"); // WIP TOME-miss? break; @@ -463,11 +463,11 @@ namespace HeavenStudio.Games.Scripts_PowerCalligraphy case (int)LetterType.kokoro: break; - case (int)LetterType.tsurunihamushi: + case (int)LetterType.face: SoundByte.PlayOneShotGame("powerCalligraphy/9"); // WIP HARAI-miss? break; - case (int)LetterType.tsurunihamushi_korean: + case (int)LetterType.face_korean: SoundByte.PlayOneShotGame("powerCalligraphy/9"); // WIP HARAI-miss? break; } @@ -489,8 +489,8 @@ namespace HeavenStudio.Games.Scripts_PowerCalligraphy case (int)LetterType.re: break; - case (int)LetterType.ten: - fudePosAnim.DoScaledAnimationAsync("fudePos-ten02-miss", 0.5f); + case (int)LetterType.comma: + fudePosAnim.DoScaledAnimationAsync("fudePos-comma02-miss", 0.5f); break; case (int)LetterType.chikara: @@ -505,10 +505,10 @@ namespace HeavenStudio.Games.Scripts_PowerCalligraphy case (int)LetterType.kokoro: break; - case (int)LetterType.tsurunihamushi: + case (int)LetterType.face: break; - case (int)LetterType.tsurunihamushi_korean: + case (int)LetterType.face_korean: break; } } diff --git a/Assets/Scripts/USG.g/LoadMinigames.Minigames.MinigameLoaderGenerator.g.cs b/Assets/Scripts/USG.g/LoadMinigames.Minigames.MinigameLoaderGenerator.g.cs index 3c1b89057..60f65bea6 100644 --- a/Assets/Scripts/USG.g/LoadMinigames.Minigames.MinigameLoaderGenerator.g.cs +++ b/Assets/Scripts/USG.g/LoadMinigames.Minigames.MinigameLoaderGenerator.g.cs @@ -393,6 +393,16 @@ namespace HeavenStudio Debug.LogWarning("Game loader CtrPillowLoader failed!"); } + game = AgbPowerCalligraphy.AddGame(eventCaller); + if (game != null) + { + eventCaller.minigames.Add(game.name, game); + } + else + { + Debug.LogWarning("Game loader AgbPowerCalligraphy failed!"); + } + game = AgbQuizShowLoader.AddGame(eventCaller); if (game != null) {