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 06e3817f4..000000000 Binary files a/Assets/Resources/Sprites/Games/PowerCalligraphy/fude-1.png and /dev/null differ diff --git a/Assets/Resources/Sprites/Games/PowerCalligraphy/fude-1.png.meta b/Assets/Resources/Sprites/Games/PowerCalligraphy/fude-1.png.meta deleted file mode 100644 index ee376f49a..000000000 --- a/Assets/Resources/Sprites/Games/PowerCalligraphy/fude-1.png.meta +++ /dev/null @@ -1,145 +0,0 @@ -fileFormatVersion: 2 -guid: 4aa84d2ffe6f85b4eb45d80e768ba5be -TextureImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 12 - mipmaps: - mipMapMode: 0 - enableMipMap: 0 - sRGBTexture: 1 - linearTexture: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapsPreserveCoverage: 0 - alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: 0.25 - normalMapFilter: 0 - isReadable: 0 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 - vTOnly: 0 - ignoreMasterTextureLimit: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: 1 - aniso: 1 - mipBias: 0 - wrapU: 1 - wrapV: 1 - wrapW: 1 - nPOTScale: 0 - lightmap: 0 - compressionQuality: 50 - spriteMode: 2 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 1 - alphaIsTransparency: 1 - spriteTessellationDetail: -1 - textureType: 8 - textureShape: 1 - singleChannelComponent: 0 - flipbookRows: 1 - flipbookColumns: 1 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - ignorePngGamma: 0 - applyGammaDecoding: 0 - cookieLightType: 0 - platformSettings: - - serializedVersion: 3 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Standalone - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Server - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - spriteSheet: - serializedVersion: 2 - sprites: - - serializedVersion: 2 - name: fude-1_0 - rect: - serializedVersion: 2 - x: 2 - y: 2 - width: 53 - height: 251 - alignment: 0 - pivot: {x: 0.5, y: 0.5} - border: {x: 0, y: 0, z: 0, w: 0} - outline: [] - physicsShape: [] - tessellationDetail: 0 - bones: [] - spriteID: 56b8a9e1bcd994c41958cfa281adf10c - internalID: -1824134705 - vertices: [] - indices: - edges: [] - weights: [] - outline: [] - physicsShape: [] - bones: [] - spriteID: 5e97eb03825dee720800000000000000 - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - nameFileIdTable: - fude-1_0: -1824134705 - spritePackingTag: - pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/PowerCalligraphy/fude.png.meta b/Assets/Resources/Sprites/Games/PowerCalligraphy/fude.png.meta index c1c6c4217..67ddf0b08 100644 --- a/Assets/Resources/Sprites/Games/PowerCalligraphy/fude.png.meta +++ b/Assets/Resources/Sprites/Games/PowerCalligraphy/fude.png.meta @@ -44,7 +44,7 @@ TextureImporter: compressionQuality: 50 spriteMode: 2 spriteExtrude: 1 - spriteMeshType: 1 + spriteMeshType: 0 alignment: 0 spritePivot: {x: 0.5, y: 0.5} spritePixelsToUnits: 100 @@ -108,10 +108,10 @@ TextureImporter: name: hand_0 rect: serializedVersion: 2 - x: 1 - y: 704 - width: 359 - height: 319 + x: 2 + y: 705 + width: 357 + height: 317 alignment: 0 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} @@ -129,10 +129,10 @@ TextureImporter: name: hand_1 rect: serializedVersion: 2 - x: 1 - y: 384 - width: 359 - height: 319 + x: 2 + y: 385 + width: 357 + height: 317 alignment: 0 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} @@ -150,10 +150,10 @@ TextureImporter: name: hand_2 rect: serializedVersion: 2 - x: 1 - y: 64 - width: 359 - height: 319 + x: 2 + y: 65 + width: 357 + height: 317 alignment: 0 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} @@ -171,10 +171,10 @@ TextureImporter: name: thumb_0 rect: serializedVersion: 2 - x: 609 - y: 720 - width: 111 - height: 95 + x: 610 + y: 721 + width: 109 + height: 93 alignment: 0 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} @@ -189,16 +189,16 @@ TextureImporter: edges: [] weights: [] - serializedVersion: 2 - name: fude_0 + name: fude_stick_0 rect: serializedVersion: 2 - x: 633 - y: 936 - width: 55 - height: 87 + x: 634 + y: 937 + width: 53 + height: 84 alignment: 0 pivot: {x: 0.5, y: 0.5} - border: {x: 0, y: 0, z: 0, w: 0} + border: {x: 0, y: 44, z: 0, w: 19} outline: [] physicsShape: [] tessellationDetail: 0 @@ -213,10 +213,10 @@ TextureImporter: name: fude_tip_0 rect: serializedVersion: 2 - x: 361 - y: 936 - width: 63 - height: 87 + x: 362 + y: 937 + width: 61 + height: 85 alignment: 0 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} @@ -231,13 +231,13 @@ TextureImporter: edges: [] weights: [] - serializedVersion: 2 - name: fude_ball_0 + name: fude_ball rect: serializedVersion: 2 - x: 801 - y: 704 - width: 55 - height: 55 + x: 802 + y: 705 + width: 53 + height: 53 alignment: 0 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} @@ -252,13 +252,13 @@ TextureImporter: edges: [] weights: [] - serializedVersion: 2 - name: fude_1 + name: fude_stick_2 rect: serializedVersion: 2 - x: 745 - y: 792 - width: 55 - height: 231 + x: 746 + y: 793 + width: 53 + height: 229 alignment: 0 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} @@ -273,13 +273,13 @@ TextureImporter: edges: [] weights: [] - serializedVersion: 2 - name: fude_2 + name: fude_stick_3 rect: serializedVersion: 2 - x: 801 - y: 760 - width: 55 - height: 263 + x: 802 + y: 761 + width: 53 + height: 261 alignment: 0 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} @@ -294,13 +294,13 @@ TextureImporter: edges: [] weights: [] - serializedVersion: 2 - name: fude_3 + name: fude_stick_4 rect: serializedVersion: 2 - x: 857 - y: 704 - width: 55 - height: 319 + x: 858 + y: 705 + width: 53 + height: 317 alignment: 0 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} @@ -315,13 +315,13 @@ TextureImporter: edges: [] weights: [] - serializedVersion: 2 - name: fude_4 + name: fude_stick_5 rect: serializedVersion: 2 - x: 913 - y: 704 - width: 55 - height: 319 + x: 914 + y: 705 + width: 53 + height: 317 alignment: 0 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} @@ -336,13 +336,13 @@ TextureImporter: edges: [] weights: [] - serializedVersion: 2 - name: fude_5 + name: fude_stick_6 rect: serializedVersion: 2 - x: 969 - y: 704 - width: 55 - height: 319 + x: 970 + y: 705 + width: 53 + height: 317 alignment: 0 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} @@ -360,12 +360,12 @@ TextureImporter: name: fude_tip_1 rect: serializedVersion: 2 - x: 425 - y: 936 - width: 63 - height: 87 + x: 426 + y: 937 + width: 61 + height: 85 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] @@ -381,12 +381,12 @@ TextureImporter: name: fude_tip_2 rect: serializedVersion: 2 - x: 489 - y: 936 - width: 63 - height: 87 + x: 490 + y: 937 + width: 61 + height: 85 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] @@ -402,12 +402,12 @@ TextureImporter: name: fude_tip_3 rect: serializedVersion: 2 - x: 553 - y: 936 - width: 79 - height: 87 + x: 554 + y: 937 + width: 77 + height: 85 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] @@ -423,12 +423,12 @@ TextureImporter: name: fude_tip_4 rect: serializedVersion: 2 - x: 361 - y: 872 - width: 79 - height: 63 + x: 362 + y: 873 + width: 77 + height: 61 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] @@ -444,12 +444,12 @@ TextureImporter: name: fude_tip_5 rect: serializedVersion: 2 - x: 441 - y: 872 - width: 79 - height: 63 + x: 442 + y: 873 + width: 77 + height: 61 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] @@ -465,12 +465,12 @@ TextureImporter: name: fude_tip_6 rect: serializedVersion: 2 - x: 521 - y: 872 - width: 87 - height: 63 + x: 522 + y: 873 + width: 85 + height: 61 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] @@ -482,6 +482,132 @@ TextureImporter: indices: edges: [] weights: [] + - serializedVersion: 2 + name: fude_stick_1 + rect: + serializedVersion: 2 + x: 690 + y: 937 + width: 53 + height: 85 + alignment: 0 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 45, z: 0, w: 39} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: de621df849ecace428b0d852dd36ffa4 + internalID: -614226590 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: fude_tip_7 + rect: + serializedVersion: 2 + x: 362 + y: 761 + width: 77 + height: 109 + alignment: 0 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 16efc6baaff35594a97fd380d68ea23f + internalID: 1641867280 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: fude_tip_8 + rect: + serializedVersion: 2 + x: 442 + y: 761 + width: 77 + height: 109 + alignment: 0 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 51086a7653ca69e47bf83face3f709db + internalID: -480801223 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: fude_tip_9 + rect: + serializedVersion: 2 + x: 522 + y: 761 + width: 85 + height: 109 + alignment: 0 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: dfd8c5a1d2d50514ba6fb1c90c070bf1 + internalID: -436236477 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: fude_tip_10 + rect: + serializedVersion: 2 + x: 610 + y: 817 + width: 53 + height: 117 + alignment: 0 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: cda256b1bb5a27a49a8e59680fb83b6c + internalID: -649290134 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: fude_tip_11 + rect: + serializedVersion: 2 + x: 666 + y: 817 + width: 53 + height: 117 + alignment: 0 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: c1a4e174e016ed442a805003f1a4b5da + internalID: -592982681 + vertices: [] + indices: + edges: [] + weights: [] outline: [] physicsShape: [] bones: [] @@ -493,20 +619,27 @@ TextureImporter: weights: [] secondaryTextures: [] nameFileIdTable: - fude_0: 1419783882 - fude_1: 1855151953 - fude_2: -1492556270 - fude_3: 1078653857 - fude_4: -2145719836 - fude_5: 2024406486 - fude_ball_0: 213573052 + fude_0: -10973233 + fude_ball: 213573052 + fude_stick_0: 1419783882 + fude_stick_1: -614226590 + fude_stick_2: 1855151953 + fude_stick_3: -1492556270 + fude_stick_4: 1078653857 + fude_stick_5: -2145719836 + fude_stick_6: 2024406486 fude_tip_0: -1714488886 fude_tip_1: 430081996 + fude_tip_10: -649290134 + fude_tip_11: -592982681 fude_tip_2: -721978998 fude_tip_3: -192802799 fude_tip_4: -1422397272 fude_tip_5: 1158996790 fude_tip_6: -268905281 + fude_tip_7: 1641867280 + fude_tip_8: -480801223 + fude_tip_9: -436236477 hand_0: 2142888950 hand_1: 1981511391 hand_2: 1325106110 diff --git a/Assets/Scripts/Games/PowerCalligraphy/PowerCalligraphy.cs b/Assets/Scripts/Games/PowerCalligraphy/PowerCalligraphy.cs index c048f71cb..b237b08ba 100644 --- a/Assets/Scripts/Games/PowerCalligraphy/PowerCalligraphy.cs +++ b/Assets/Scripts/Games/PowerCalligraphy/PowerCalligraphy.cs @@ -18,17 +18,37 @@ namespace HeavenStudio.Games.Loaders { return new Minigame("powerCalligraphy", "Power Calligraphy", "ffffff", false, false, new List() { - 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) {