optimize the fan club prefab

use anim layers for the monkeys
This commit is contained in:
minenice55 2024-03-21 22:38:20 -04:00
parent 369a14efd5
commit 7d47d1ea87
14 changed files with 2835 additions and 4050 deletions

View file

@ -15,7 +15,7 @@ GameObject:
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_StaticEditorFlags: 4
m_IsActive: 1
--- !u!4 &7592586158305134036
Transform:
@ -72,7 +72,7 @@ SpriteRenderer:
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: -59
m_SortingOrder: -51
m_Sprite: {fileID: -6865166174647843173, guid: 01a2ac0ac3bc28c4b9d1349ebe7a1d7e, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0
@ -95,11 +95,11 @@ GameObject:
- component: {fileID: 334835662374275253}
- component: {fileID: 293369301031660030}
m_Layer: 0
m_Name: ntrIdol_BG_lightsGlow (2)
m_Name: R_ntrIdol_BG_lightsGlow (2)
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_StaticEditorFlags: 4
m_IsActive: 1
--- !u!4 &334835662374275253
Transform:
@ -109,12 +109,12 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 272991852032337409}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: -1.838, y: 0.235, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_LocalPosition: {x: 2.8058405, y: 1.0412035, z: 0}
m_LocalScale: {x: -0.6800001, y: 0.6800001, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 6147393778172225684}
m_RootOrder: 0
m_Father: {fileID: 3888685956083257698}
m_RootOrder: 12
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!212 &293369301031660030
SpriteRenderer:
@ -156,9 +156,9 @@ SpriteRenderer:
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: -60
m_SortingOrder: -59
m_Sprite: {fileID: 6173397441192772630, guid: 01a2ac0ac3bc28c4b9d1349ebe7a1d7e, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 0.5882353}
m_Color: {r: 1, g: 1, b: 1, a: 0.7058824}
m_FlipX: 1
m_FlipY: 0
m_DrawMode: 0
@ -200,7 +200,7 @@ Transform:
- {fileID: 1098005725321748408}
- {fileID: 8759925635928576841}
m_Father: {fileID: 462007768647795539}
m_RootOrder: 6
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &687827922883792441
GameObject:
@ -213,11 +213,11 @@ GameObject:
- component: {fileID: 3723980323912538373}
- component: {fileID: 1240745011880190875}
m_Layer: 0
m_Name: ntrIdol_BG_lights
m_Name: L_ntrIdol_BG_lights
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_StaticEditorFlags: 4
m_IsActive: 1
--- !u!4 &3723980323912538373
Transform:
@ -227,13 +227,12 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 687827922883792441}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: -2.403, y: 1.971, z: 2.7876513}
m_LocalPosition: {x: -3.2030003, y: 1.7064034, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 5184628072119113458}
m_Father: {fileID: 7755842072912826309}
m_RootOrder: 3
m_Children: []
m_Father: {fileID: 3888685956083257698}
m_RootOrder: 13
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!212 &1240745011880190875
SpriteRenderer:
@ -298,11 +297,11 @@ GameObject:
- component: {fileID: 1103524513433677257}
- component: {fileID: 4169351977670385831}
m_Layer: 0
m_Name: ntrIdol_BG_lightsGlow (2)
m_Name: L_ntrIdol_BG_lightsGlow (2)
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_StaticEditorFlags: 4
m_IsActive: 1
--- !u!4 &1103524513433677257
Transform:
@ -312,12 +311,12 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 769681989340637404}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: -1.838, y: 0.235, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_LocalPosition: {x: -2.8058405, y: 1.0412035, z: 0}
m_LocalScale: {x: 0.6800001, y: 0.6800001, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 3831937590633374463}
m_RootOrder: 0
m_Father: {fileID: 3888685956083257698}
m_RootOrder: 9
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!212 &4169351977670385831
SpriteRenderer:
@ -359,9 +358,9 @@ SpriteRenderer:
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: -60
m_SortingOrder: -59
m_Sprite: {fileID: 6173397441192772630, guid: 01a2ac0ac3bc28c4b9d1349ebe7a1d7e, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 0.5882353}
m_Color: {r: 1, g: 1, b: 1, a: 0.7058824}
m_FlipX: 1
m_FlipY: 0
m_DrawMode: 0
@ -386,7 +385,7 @@ GameObject:
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_StaticEditorFlags: 4
m_IsActive: 1
--- !u!4 &8759925635928576841
Transform:
@ -570,14 +569,11 @@ Transform:
- {fileID: 4178792057385165581}
- {fileID: 4613239352523977866}
- {fileID: 1235353458923427737}
- {fileID: 3723980323912538373}
- {fileID: 7650795570359494449}
- {fileID: 3831937590633374463}
- {fileID: 4262631391305165020}
- {fileID: 8589696124567122189}
- {fileID: 6558902694312358860}
m_Father: {fileID: 3888685956083257698}
m_RootOrder: 7
m_RootOrder: 19
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1332864167275894922
GameObject:
@ -609,7 +605,7 @@ Transform:
m_Children:
- {fileID: 8020046360594858975}
m_Father: {fileID: 3248844209599200740}
m_RootOrder: 10
m_RootOrder: 9
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1344584692415934519
GameObject:
@ -622,11 +618,11 @@ GameObject:
- component: {fileID: 3831937590633374463}
- component: {fileID: 9129692450401278336}
m_Layer: 0
m_Name: ntrIdol_BG_lights (1)
m_Name: L_ntrIdol_BG_lights (1)
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_StaticEditorFlags: 4
m_IsActive: 1
--- !u!4 &3831937590633374463
Transform:
@ -636,13 +632,12 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1344584692415934519}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: -0.756, y: 1.146, z: 2.7876513}
m_LocalScale: {x: 0.68, y: 0.68, z: 1}
m_LocalPosition: {x: -1.5560001, y: 0.8814034, z: 0}
m_LocalScale: {x: 0.68000007, y: 0.68000007, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 1103524513433677257}
m_Father: {fileID: 7755842072912826309}
m_RootOrder: 5
m_Children: []
m_Father: {fileID: 3888685956083257698}
m_RootOrder: 15
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!212 &9129692450401278336
SpriteRenderer:
@ -684,7 +679,7 @@ SpriteRenderer:
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: -61
m_SortingOrder: -60
m_Sprite: {fileID: -8250007594341715901, guid: 01a2ac0ac3bc28c4b9d1349ebe7a1d7e, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 0.4705882}
m_FlipX: 1
@ -711,7 +706,7 @@ GameObject:
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_StaticEditorFlags: 4
m_IsActive: 1
--- !u!4 &6316345112285167602
Transform:
@ -791,11 +786,11 @@ GameObject:
- component: {fileID: 7650795570359494449}
- component: {fileID: 7093111610832620220}
m_Layer: 0
m_Name: ntrIdol_BG_lights (2)
m_Name: L_ntrIdol_BG_lights (2)
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_StaticEditorFlags: 4
m_IsActive: 1
--- !u!4 &7650795570359494449
Transform:
@ -805,13 +800,12 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1516990179672933351}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: -2.034, y: 1.302, z: 2.7876513}
m_LocalScale: {x: 0.68, y: 0.68, z: 1}
m_LocalPosition: {x: -2.834, y: 1.0374033, z: 0}
m_LocalScale: {x: 0.68000007, y: 0.68000007, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 7229550052057150214}
m_Father: {fileID: 7755842072912826309}
m_RootOrder: 4
m_Children: []
m_Father: {fileID: 3888685956083257698}
m_RootOrder: 14
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!212 &7093111610832620220
SpriteRenderer:
@ -853,7 +847,7 @@ SpriteRenderer:
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: -61
m_SortingOrder: -60
m_Sprite: {fileID: -8250007594341715901, guid: 01a2ac0ac3bc28c4b9d1349ebe7a1d7e, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 0.4705882}
m_FlipX: 1
@ -5775,11 +5769,11 @@ GameObject:
- component: {fileID: 1427908021350781262}
- component: {fileID: 208380636975840451}
m_Layer: 0
m_Name: ntrIdol_BG_lights (2)
m_Name: R_ntrIdol_BG_lights (2)
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_StaticEditorFlags: 4
m_IsActive: 1
--- !u!4 &1427908021350781262
Transform:
@ -5789,13 +5783,12 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1748877704630793671}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: -2.034, y: 1.302, z: 2.7876513}
m_LocalScale: {x: 0.68, y: 0.68, z: 1}
m_LocalPosition: {x: 2.834, y: 1.0374033, z: 0}
m_LocalScale: {x: -0.68000007, y: 0.68000007, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 825991275225010873}
m_Father: {fileID: 462007768647795539}
m_RootOrder: 4
m_Children: []
m_Father: {fileID: 3888685956083257698}
m_RootOrder: 17
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!212 &208380636975840451
SpriteRenderer:
@ -5837,7 +5830,7 @@ SpriteRenderer:
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: -61
m_SortingOrder: -60
m_Sprite: {fileID: -8250007594341715901, guid: 01a2ac0ac3bc28c4b9d1349ebe7a1d7e, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 0.4705882}
m_FlipX: 1
@ -5881,7 +5874,7 @@ Transform:
- {fileID: 6113537268761158109}
- {fileID: 1799509382894997381}
m_Father: {fileID: 462007768647795539}
m_RootOrder: 7
m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1934474295410912400
GameObject:
@ -5898,7 +5891,7 @@ GameObject:
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_StaticEditorFlags: 4
m_IsActive: 1
--- !u!4 &8742863816171711587
Transform:
@ -6000,7 +5993,7 @@ Transform:
- {fileID: 6441311111710137304}
- {fileID: 5538384077018632274}
m_Father: {fileID: 3248844209599200740}
m_RootOrder: 9
m_RootOrder: 8
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!198 &2954522991582128795
ParticleSystem:
@ -10909,11 +10902,11 @@ GameObject:
- component: {fileID: 8328254305440837121}
- component: {fileID: 2500696144322512061}
m_Layer: 0
m_Name: ntrIdol_BG_lights
m_Name: R_ntrIdol_BG_lights
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_StaticEditorFlags: 4
m_IsActive: 1
--- !u!4 &8328254305440837121
Transform:
@ -10923,13 +10916,12 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2232060102428699341}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: -2.403, y: 1.971, z: 2.7876513}
m_LocalScale: {x: 1, y: 1, z: 1}
m_LocalPosition: {x: 3.2030003, y: 1.7064034, z: 0}
m_LocalScale: {x: -1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 1892954699195691548}
m_Father: {fileID: 462007768647795539}
m_RootOrder: 3
m_Children: []
m_Father: {fileID: 3888685956083257698}
m_RootOrder: 16
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!212 &2500696144322512061
SpriteRenderer:
@ -11095,7 +11087,7 @@ GameObject:
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_StaticEditorFlags: 4
m_IsActive: 1
--- !u!4 &1799509382894997381
Transform:
@ -11195,14 +11187,11 @@ Transform:
- {fileID: 8088625019708417881}
- {fileID: 8545974396314950087}
- {fileID: 3425157468644761347}
- {fileID: 8328254305440837121}
- {fileID: 1427908021350781262}
- {fileID: 6147393778172225684}
- {fileID: 4936448643686709332}
- {fileID: 4313459870519728285}
- {fileID: 5294634777003009409}
m_Father: {fileID: 3888685956083257698}
m_RootOrder: 8
m_RootOrder: 20
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &2750852513549371225
GameObject:
@ -16031,7 +16020,7 @@ GameObject:
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_StaticEditorFlags: 4
m_IsActive: 1
--- !u!4 &1701010400097446865
Transform:
@ -16115,7 +16104,7 @@ GameObject:
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_StaticEditorFlags: 4
m_IsActive: 1
--- !u!4 &6113537268761158109
Transform:
@ -16279,11 +16268,11 @@ GameObject:
- component: {fileID: 1892954699195691548}
- component: {fileID: 5111061014115326266}
m_Layer: 0
m_Name: ntrIdol_BG_lightsGlow
m_Name: R_ntrIdol_BG_lightsGlow
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_StaticEditorFlags: 4
m_IsActive: 1
--- !u!4 &1892954699195691548
Transform:
@ -16293,12 +16282,12 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3588879144043084175}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0.039, y: 0.011, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_LocalPosition: {x: 3.1640003, y: 1.7174035, z: 0}
m_LocalScale: {x: -1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 8328254305440837121}
m_RootOrder: 0
m_Father: {fileID: 3888685956083257698}
m_RootOrder: 10
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!212 &5111061014115326266
SpriteRenderer:
@ -16367,7 +16356,7 @@ GameObject:
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_StaticEditorFlags: 4
m_IsActive: 1
--- !u!4 &3193360959197843055
Transform:
@ -16451,7 +16440,7 @@ GameObject:
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_StaticEditorFlags: 4
m_IsActive: 1
--- !u!4 &8088625019708417881
Transform:
@ -16535,7 +16524,7 @@ GameObject:
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_StaticEditorFlags: 4
m_IsActive: 1
--- !u!4 &1235353458923427737
Transform:
@ -21585,7 +21574,7 @@ GameObject:
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_StaticEditorFlags: 4
m_IsActive: 1
--- !u!4 &4613239352523977866
Transform:
@ -21669,7 +21658,7 @@ GameObject:
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_StaticEditorFlags: 4
m_IsActive: 1
--- !u!4 &6029303632643430900
Transform:
@ -21749,11 +21738,11 @@ GameObject:
- component: {fileID: 825991275225010873}
- component: {fileID: 797562537414615781}
m_Layer: 0
m_Name: ntrIdol_BG_lightsGlow (1)
m_Name: R_ntrIdol_BG_lightsGlow (1)
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_StaticEditorFlags: 4
m_IsActive: 1
--- !u!4 &825991275225010873
Transform:
@ -21763,12 +21752,12 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4706589738247262763}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 1.909, y: -0.235, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_LocalPosition: {x: 1.5358801, y: 0.87760335, z: 0}
m_LocalScale: {x: -0.6800001, y: 0.6800001, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 1427908021350781262}
m_RootOrder: 0
m_Father: {fileID: 3888685956083257698}
m_RootOrder: 11
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!212 &797562537414615781
SpriteRenderer:
@ -21810,9 +21799,9 @@ SpriteRenderer:
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: -60
m_SortingOrder: -59
m_Sprite: {fileID: 6173397441192772630, guid: 01a2ac0ac3bc28c4b9d1349ebe7a1d7e, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 0.5882353}
m_Color: {r: 1, g: 1, b: 1, a: 0.7058824}
m_FlipX: 1
m_FlipY: 0
m_DrawMode: 0
@ -21837,7 +21826,7 @@ GameObject:
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_StaticEditorFlags: 4
m_IsActive: 1
--- !u!4 &6558902694312358860
Transform:
@ -21852,7 +21841,7 @@ Transform:
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 7755842072912826309}
m_RootOrder: 8
m_RootOrder: 5
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 82.93}
--- !u!212 &5874338285654298519
SpriteRenderer:
@ -21938,7 +21927,7 @@ Transform:
m_Children:
- {fileID: 2080437860285008043}
m_Father: {fileID: 3248844209599200740}
m_RootOrder: 8
m_RootOrder: 7
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!198 &425051775638374545
ParticleSystem:
@ -26797,11 +26786,11 @@ GameObject:
- component: {fileID: 7229550052057150214}
- component: {fileID: 3603949744510550328}
m_Layer: 0
m_Name: ntrIdol_BG_lightsGlow (1)
m_Name: L_ntrIdol_BG_lightsGlow (1)
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_StaticEditorFlags: 4
m_IsActive: 1
--- !u!4 &7229550052057150214
Transform:
@ -26811,12 +26800,12 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5129871325754859325}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 1.909, y: -0.235, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_LocalPosition: {x: -1.5358801, y: 0.87760335, z: 0}
m_LocalScale: {x: 0.6800001, y: 0.6800001, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 7650795570359494449}
m_RootOrder: 0
m_Father: {fileID: 3888685956083257698}
m_RootOrder: 8
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!212 &3603949744510550328
SpriteRenderer:
@ -26858,9 +26847,9 @@ SpriteRenderer:
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: -60
m_SortingOrder: -59
m_Sprite: {fileID: 6173397441192772630, guid: 01a2ac0ac3bc28c4b9d1349ebe7a1d7e, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 0.5882353}
m_Color: {r: 1, g: 1, b: 1, a: 0.7058824}
m_FlipX: 1
m_FlipY: 0
m_DrawMode: 0
@ -26905,13 +26894,13 @@ Transform:
- {fileID: 5352825305120310155}
- {fileID: 2937251253109900352}
- {fileID: 3894513247869131856}
- {fileID: 4847749933810664173}
- {fileID: 2755896156297013789}
- {fileID: 5664814609893768833}
- {fileID: 5374475929901968218}
- {fileID: 1118549402802518502}
- {fileID: 1071264539521643918}
- {fileID: 7260122170917461530}
- {fileID: 4847749933810664173}
- {fileID: 1071264539521643918}
- {fileID: 8601508448830542631}
m_Father: {fileID: 0}
m_RootOrder: 0
@ -27203,7 +27192,7 @@ Transform:
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 3248844209599200740}
m_RootOrder: 11
m_RootOrder: 12
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!212 &1324401130265099558
SpriteRenderer:
@ -27294,6 +27283,18 @@ Transform:
- {fileID: 5238619710463553324}
- {fileID: 6029303632643430900}
- {fileID: 1701010400097446865}
- {fileID: 5184628072119113458}
- {fileID: 7229550052057150214}
- {fileID: 1103524513433677257}
- {fileID: 1892954699195691548}
- {fileID: 825991275225010873}
- {fileID: 334835662374275253}
- {fileID: 3723980323912538373}
- {fileID: 7650795570359494449}
- {fileID: 3831937590633374463}
- {fileID: 8328254305440837121}
- {fileID: 1427908021350781262}
- {fileID: 6147393778172225684}
- {fileID: 7755842072912826309}
- {fileID: 462007768647795539}
m_Father: {fileID: 3248844209599200740}
@ -27342,11 +27343,11 @@ GameObject:
- component: {fileID: 6147393778172225684}
- component: {fileID: 662732223473817827}
m_Layer: 0
m_Name: ntrIdol_BG_lights (1)
m_Name: R_ntrIdol_BG_lights (1)
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_StaticEditorFlags: 4
m_IsActive: 1
--- !u!4 &6147393778172225684
Transform:
@ -27356,13 +27357,12 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5736914464357109791}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: -0.756, y: 1.146, z: 2.7876513}
m_LocalScale: {x: 0.68, y: 0.68, z: 1}
m_LocalPosition: {x: 1.5560001, y: 0.8814034, z: 0}
m_LocalScale: {x: -0.68000007, y: 0.68000007, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 334835662374275253}
m_Father: {fileID: 462007768647795539}
m_RootOrder: 5
m_Children: []
m_Father: {fileID: 3888685956083257698}
m_RootOrder: 18
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!212 &662732223473817827
SpriteRenderer:
@ -27404,7 +27404,7 @@ SpriteRenderer:
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: -61
m_SortingOrder: -60
m_Sprite: {fileID: -8250007594341715901, guid: 01a2ac0ac3bc28c4b9d1349ebe7a1d7e, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 0.4705882}
m_FlipX: 1
@ -27431,7 +27431,7 @@ GameObject:
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_StaticEditorFlags: 4
m_IsActive: 1
--- !u!4 &1295386062644841905
Transform:
@ -27515,7 +27515,7 @@ GameObject:
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_StaticEditorFlags: 4
m_IsActive: 1
--- !u!4 &8721488119743148990
Transform:
@ -27599,7 +27599,7 @@ GameObject:
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_StaticEditorFlags: 4
m_IsActive: 1
--- !u!4 &1098005725321748408
Transform:
@ -27763,11 +27763,11 @@ GameObject:
- component: {fileID: 5184628072119113458}
- component: {fileID: 909124587769225330}
m_Layer: 0
m_Name: ntrIdol_BG_lightsGlow
m_Name: L_ntrIdol_BG_lightsGlow
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_StaticEditorFlags: 4
m_IsActive: 1
--- !u!4 &5184628072119113458
Transform:
@ -27777,12 +27777,12 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6516337297425398596}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0.039, y: 0.011, z: 0}
m_LocalPosition: {x: -3.1640003, y: 1.7174035, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 3723980323912538373}
m_RootOrder: 0
m_Father: {fileID: 3888685956083257698}
m_RootOrder: 7
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!212 &909124587769225330
SpriteRenderer:
@ -42556,7 +42556,7 @@ Transform:
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 3248844209599200740}
m_RootOrder: 7
m_RootOrder: 6
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!212 &3158876344998128592
SpriteRenderer:
@ -42625,7 +42625,7 @@ GameObject:
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_StaticEditorFlags: 4
m_IsActive: 1
--- !u!4 &3425157468644761347
Transform:
@ -42808,7 +42808,7 @@ Transform:
m_Children:
- {fileID: 3020217064459638061}
m_Father: {fileID: 3248844209599200740}
m_RootOrder: 12
m_RootOrder: 10
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &7887303562412097645
GameObject:
@ -42825,7 +42825,7 @@ GameObject:
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_StaticEditorFlags: 4
m_IsActive: 1
--- !u!4 &5294634777003009409
Transform:
@ -42840,7 +42840,7 @@ Transform:
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 462007768647795539}
m_RootOrder: 8
m_RootOrder: 5
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 82.93}
--- !u!212 &5594960738998290071
SpriteRenderer:
@ -42926,7 +42926,7 @@ Transform:
- {fileID: 272412975552483362}
- {fileID: 6544378925003046537}
m_Father: {fileID: 7755842072912826309}
m_RootOrder: 7
m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &8207700755788932953
GameObject:
@ -42943,7 +42943,7 @@ GameObject:
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_StaticEditorFlags: 4
m_IsActive: 1
--- !u!4 &272412975552483362
Transform:
@ -43044,7 +43044,7 @@ Transform:
- {fileID: 8742863816171711587}
- {fileID: 8721488119743148990}
m_Father: {fileID: 7755842072912826309}
m_RootOrder: 6
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &8448450037515034084
GameObject:
@ -43061,7 +43061,7 @@ GameObject:
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_StaticEditorFlags: 4
m_IsActive: 1
--- !u!4 &3848253697322167677
Transform:
@ -43118,7 +43118,7 @@ SpriteRenderer:
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: -59
m_SortingOrder: -51
m_Sprite: {fileID: -6865166174647843173, guid: 01a2ac0ac3bc28c4b9d1349ebe7a1d7e, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0
@ -43145,7 +43145,7 @@ GameObject:
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_StaticEditorFlags: 4
m_IsActive: 1
--- !u!4 &4178792057385165581
Transform:
@ -43229,7 +43229,7 @@ GameObject:
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_StaticEditorFlags: 4
m_IsActive: 1
--- !u!4 &6544378925003046537
Transform:
@ -43328,7 +43328,7 @@ Transform:
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 3248844209599200740}
m_RootOrder: 6
m_RootOrder: 11
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!212 &2791713092454388370
SpriteRenderer:
@ -43481,7 +43481,7 @@ GameObject:
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_StaticEditorFlags: 4
m_IsActive: 1
--- !u!4 &1308279973454495906
Transform:
@ -48435,7 +48435,7 @@ GameObject:
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_StaticEditorFlags: 4
m_IsActive: 1
--- !u!4 &8545974396314950087
Transform:

View file

@ -126,7 +126,6 @@ GameObject:
m_Component:
- component: {fileID: 56459388288667230}
- component: {fileID: 6081714594395896892}
- component: {fileID: 1809157423920691603}
m_Layer: 0
m_Name: Head
m_TagString: Untagged
@ -201,27 +200,6 @@ SpriteRenderer:
m_WasSpriteAssigned: 1
m_MaskInteraction: 0
m_SpriteSortPoint: 0
--- !u!95 &1809157423920691603
Animator:
serializedVersion: 5
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1228995257292701134}
m_Enabled: 1
m_Avatar: {fileID: 0}
m_Controller: {fileID: 9100000, guid: 4f08851cf14a1f245ba2a3206e1df5c0, type: 2}
m_CullingMode: 0
m_UpdateMode: 0
m_ApplyRootMotion: 0
m_LinearVelocityBlending: 0
m_StabilizeFeet: 0
m_WarningMessage:
m_HasTransformHierarchy: 1
m_AllowConstantClipSamplingOptimization: 1
m_KeepAnimatorStateOnDisable: 0
m_WriteDefaultValuesOnDisable: 0
--- !u!1 &1684698997951722136
GameObject:
m_ObjectHideFlags: 0
@ -351,7 +329,6 @@ GameObject:
- component: {fileID: 5716558783764150759}
- component: {fileID: 5851239690922791261}
- component: {fileID: 639528768091201485}
- component: {fileID: 4151796234699204600}
m_Layer: 0
m_Name: Fan
m_TagString: Untagged
@ -413,22 +390,11 @@ MonoBehaviour:
m_EditorClassIdentifier:
motionRoot: {fileID: 5186748553521627558}
headRoot: {fileID: 756044304266985371}
sortingGroup: {fileID: 3815385048264988683}
animator: {fileID: 5851239690922791261}
headAnimator: {fileID: 1809157423920691603}
fanClapEffect: {fileID: 7149034128923702682}
shadow: {fileID: 5337068325991484391}
jumpStartTime: -99
--- !u!210 &4151796234699204600
SortingGroup:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3943761683339994363}
m_Enabled: 1
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 2
--- !u!1 &4132089230969200072
GameObject:
m_ObjectHideFlags: 0
@ -5392,6 +5358,7 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 7987279439154637720}
- component: {fileID: 3815385048264988683}
m_Layer: 0
m_Name: root_motion
m_TagString: Untagged
@ -5417,6 +5384,17 @@ Transform:
m_Father: {fileID: 5716558783764150759}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!210 &3815385048264988683
SortingGroup:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5186748553521627558}
m_Enabled: 1
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 2
--- !u!1 &5336030003049238152
GameObject:
m_ObjectHideFlags: 0

View file

@ -53,6 +53,32 @@ AnimatorState:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!1102 &-8170724702801921018
AnimatorState:
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: FanFaceAngryFlip
m_Speed: 1
m_CycleOffset: 0
m_Transitions: []
m_StateMachineBehaviours: []
m_Position: {x: 50, y: 50, z: 0}
m_IKOnFeet: 0
m_WriteDefaultValues: 1
m_Mirror: 0
m_SpeedParameterActive: 0
m_MirrorParameterActive: 0
m_CycleOffsetParameterActive: 0
m_TimeParameterActive: 0
m_Motion: {fileID: 7400000, guid: f08ced19d1fbd2f488b787c05a3d221b, type: 2}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!1101 &-8085249653842851412
AnimatorStateTransition:
m_ObjectHideFlags: 1
@ -127,6 +153,32 @@ AnimatorState:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!1102 &-1306772017596378706
AnimatorState:
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: FanFaceAngry
m_Speed: 1
m_CycleOffset: 0
m_Transitions: []
m_StateMachineBehaviours: []
m_Position: {x: 50, y: 50, z: 0}
m_IKOnFeet: 0
m_WriteDefaultValues: 1
m_Mirror: 0
m_SpeedParameterActive: 0
m_MirrorParameterActive: 0
m_CycleOffsetParameterActive: 0
m_TimeParameterActive: 0
m_Motion: {fileID: 7400000, guid: f5e488a04143be84dbf3d5a6d7189f6e, type: 2}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!91 &9100000
AnimatorController:
m_ObjectHideFlags: 0
@ -149,6 +201,18 @@ AnimatorController:
m_IKPass: 0
m_SyncedLayerAffectsTiming: 0
m_Controller: {fileID: 9100000}
- serializedVersion: 5
m_Name: Head
m_StateMachine: {fileID: 7966254241459359541}
m_Mask: {fileID: 0}
m_Motions: []
m_Behaviours: []
m_BlendingMode: 0
m_SyncedLayerIndex: -1
m_DefaultWeight: 1
m_IKPass: 0
m_SyncedLayerAffectsTiming: 0
m_Controller: {fileID: 9100000}
--- !u!1102 &181574356450407721
AnimatorState:
serializedVersion: 6
@ -228,6 +292,60 @@ AnimatorState:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!1102 &5924930542847065028
AnimatorState:
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: FanFaceNormal
m_Speed: 1
m_CycleOffset: 0
m_Transitions: []
m_StateMachineBehaviours: []
m_Position: {x: 50, y: 50, z: 0}
m_IKOnFeet: 0
m_WriteDefaultValues: 1
m_Mirror: 0
m_SpeedParameterActive: 0
m_MirrorParameterActive: 0
m_CycleOffsetParameterActive: 0
m_TimeParameterActive: 0
m_Motion: {fileID: 7400000, guid: 7a9c98e272a85bb4bbc7ba254608d785, type: 2}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!1107 &7966254241459359541
AnimatorStateMachine:
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Head
m_ChildStates:
- serializedVersion: 1
m_State: {fileID: -1306772017596378706}
m_Position: {x: 380, y: 170, z: 0}
- serializedVersion: 1
m_State: {fileID: 5924930542847065028}
m_Position: {x: 380, y: 110, z: 0}
- serializedVersion: 1
m_State: {fileID: -8170724702801921018}
m_Position: {x: 380, y: 220, z: 0}
m_ChildStateMachines: []
m_AnyStateTransitions: []
m_EntryTransitions: []
m_StateMachineTransitions: {}
m_StateMachineBehaviours: []
m_AnyStatePosition: {x: 50, y: 20, z: 0}
m_EntryPosition: {x: 50, y: 120, z: 0}
m_ExitPosition: {x: 800, y: 120, z: 0}
m_ParentStateMachinePosition: {x: 800, y: 20, z: 0}
m_DefaultState: {fileID: 5924930542847065028}
--- !u!1102 &8408744717283008411
AnimatorState:
serializedVersion: 6
@ -334,10 +452,10 @@ AnimatorStateMachine:
m_Position: {x: 470, y: 360, z: 0}
- serializedVersion: 1
m_State: {fileID: 2933966462888194993}
m_Position: {x: 505, y: 425, z: 0}
m_Position: {x: 470, y: 410, z: 0}
- serializedVersion: 1
m_State: {fileID: -8793785454147592114}
m_Position: {x: 540, y: 490, z: 0}
m_Position: {x: 470, y: 460, z: 0}
m_ChildStateMachines: []
m_AnyStateTransitions: []
m_EntryTransitions: []

View file

@ -48,7 +48,7 @@ AnimationClip:
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
path:
path: root_motion/Head_root/Head
m_ScaleCurves: []
m_FloatCurves: []
m_PPtrCurves:
@ -60,7 +60,7 @@ AnimationClip:
- time: 2.0666666
value: {fileID: -1732965317767057221, guid: 3ceb27c8c676e7a428cf6e15cd11b7ef, type: 3}
attribute: m_Sprite
path:
path: root_motion/Head_root/Head
classID: 212
script: {fileID: 0}
m_SampleRate: 60
@ -71,14 +71,14 @@ AnimationClip:
m_ClipBindingConstant:
genericBindings:
- serializedVersion: 2
path: 0
path: 1935997831
attribute: 1
script: {fileID: 0}
typeID: 4
customType: 0
isPPtrCurve: 0
- serializedVersion: 2
path: 0
path: 1935997831
attribute: 0
script: {fileID: 0}
typeID: 212
@ -143,7 +143,7 @@ AnimationClip:
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalPosition.x
path:
path: root_motion/Head_root/Head
classID: 4
script: {fileID: 0}
- curve:
@ -180,7 +180,7 @@ AnimationClip:
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalPosition.y
path:
path: root_motion/Head_root/Head
classID: 4
script: {fileID: 0}
- curve:
@ -217,10 +217,10 @@ AnimationClip:
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalPosition.z
path:
path: root_motion/Head_root/Head
classID: 4
script: {fileID: 0}
m_EulerEditorCurves: []
m_HasGenericRootTransform: 1
m_HasGenericRootTransform: 0
m_HasMotionFloatCurves: 0
m_Events: []

View file

@ -0,0 +1,289 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!74 &7400000
AnimationClip:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: FanFaceAngryFlip
serializedVersion: 6
m_Legacy: 0
m_Compressed: 0
m_UseHighQualityCurve: 1
m_RotationCurves: []
m_CompressedRotationCurves: []
m_EulerCurves: []
m_PositionCurves:
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: {x: -0.24, y: 0, z: 0}
inSlope: {x: Infinity, y: Infinity, z: Infinity}
outSlope: {x: Infinity, y: Infinity, z: Infinity}
tangentMode: 0
weightedMode: 0
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
- serializedVersion: 3
time: 2
value: {x: -0.08, y: 0, z: 0}
inSlope: {x: Infinity, y: Infinity, z: Infinity}
outSlope: {x: Infinity, y: Infinity, z: Infinity}
tangentMode: 0
weightedMode: 0
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
- serializedVersion: 3
time: 2.0666666
value: {x: 0, y: 0, z: 0}
inSlope: {x: Infinity, y: Infinity, z: Infinity}
outSlope: {x: Infinity, y: Infinity, z: Infinity}
tangentMode: 0
weightedMode: 0
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
path: root_motion/Head_root/Head
m_ScaleCurves: []
m_FloatCurves:
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 1
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
weightedMode: 0
inWeight: 0
outWeight: 0
- serializedVersion: 3
time: 2.0666666
value: 0
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_FlipX
path: root_motion/Head_root/Head
classID: 212
script: {fileID: 0}
m_PPtrCurves:
- curve:
- time: 0
value: {fileID: -2380161411252257728, guid: 3ceb27c8c676e7a428cf6e15cd11b7ef, type: 3}
- time: 2
value: {fileID: 5346145209676457094, guid: 3ceb27c8c676e7a428cf6e15cd11b7ef, type: 3}
- time: 2.0666666
value: {fileID: -1732965317767057221, guid: 3ceb27c8c676e7a428cf6e15cd11b7ef, type: 3}
attribute: m_Sprite
path: root_motion/Head_root/Head
classID: 212
script: {fileID: 0}
m_SampleRate: 60
m_WrapMode: 0
m_Bounds:
m_Center: {x: 0, y: 0, z: 0}
m_Extent: {x: 0, y: 0, z: 0}
m_ClipBindingConstant:
genericBindings:
- serializedVersion: 2
path: 1935997831
attribute: 1
script: {fileID: 0}
typeID: 4
customType: 0
isPPtrCurve: 0
- serializedVersion: 2
path: 1935997831
attribute: 555744692
script: {fileID: 0}
typeID: 212
customType: 0
isPPtrCurve: 0
- serializedVersion: 2
path: 1935997831
attribute: 0
script: {fileID: 0}
typeID: 212
customType: 23
isPPtrCurve: 1
pptrCurveMapping:
- {fileID: -2380161411252257728, guid: 3ceb27c8c676e7a428cf6e15cd11b7ef, type: 3}
- {fileID: 5346145209676457094, guid: 3ceb27c8c676e7a428cf6e15cd11b7ef, type: 3}
- {fileID: -1732965317767057221, guid: 3ceb27c8c676e7a428cf6e15cd11b7ef, type: 3}
m_AnimationClipSettings:
serializedVersion: 2
m_AdditiveReferencePoseClip: {fileID: 0}
m_AdditiveReferencePoseTime: 0
m_StartTime: 0
m_StopTime: 2.0833333
m_OrientationOffsetY: 0
m_Level: 0
m_CycleOffset: 0
m_HasAdditiveReferencePose: 0
m_LoopTime: 0
m_LoopBlend: 0
m_LoopBlendOrientation: 0
m_LoopBlendPositionY: 0
m_LoopBlendPositionXZ: 0
m_KeepOriginalOrientation: 0
m_KeepOriginalPositionY: 1
m_KeepOriginalPositionXZ: 0
m_HeightFromFeet: 0
m_Mirror: 0
m_EditorCurves:
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: -0.24
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 2
value: -0.08
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 2.0666666
value: 0
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalPosition.x
path: root_motion/Head_root/Head
classID: 4
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 2
value: 0
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 2.0666666
value: 0
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalPosition.y
path: root_motion/Head_root/Head
classID: 4
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 2
value: 0
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 2.0666666
value: 0
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalPosition.z
path: root_motion/Head_root/Head
classID: 4
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 1
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
weightedMode: 0
inWeight: 0
outWeight: 0
- serializedVersion: 3
time: 2.0666666
value: 0
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_FlipX
path: root_motion/Head_root/Head
classID: 212
script: {fileID: 0}
m_EulerEditorCurves: []
m_HasGenericRootTransform: 0
m_HasMotionFloatCurves: 0
m_Events: []

View file

@ -1,8 +1,8 @@
fileFormatVersion: 2
guid: 4f08851cf14a1f245ba2a3206e1df5c0
guid: f08ced19d1fbd2f488b787c05a3d221b
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 9100000
mainObjectFileID: 7400000
userData:
assetBundleName: ntridol/common
assetBundleName:
assetBundleVariant:

View file

@ -22,7 +22,7 @@ AnimationClip:
- time: 0
value: {fileID: -1732965317767057221, guid: 3ceb27c8c676e7a428cf6e15cd11b7ef, type: 3}
attribute: m_Sprite
path:
path: root_motion/Head_root/Head
classID: 212
script: {fileID: 0}
m_SampleRate: 60
@ -33,7 +33,7 @@ AnimationClip:
m_ClipBindingConstant:
genericBindings:
- serializedVersion: 2
path: 0
path: 1935997831
attribute: 0
script: {fileID: 0}
typeID: 212

View file

@ -1,101 +0,0 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1102 &-4496796211826292596
AnimatorState:
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: FanFaceNormal
m_Speed: 1
m_CycleOffset: 0
m_Transitions: []
m_StateMachineBehaviours: []
m_Position: {x: 50, y: 50, z: 0}
m_IKOnFeet: 0
m_WriteDefaultValues: 1
m_Mirror: 0
m_SpeedParameterActive: 0
m_MirrorParameterActive: 0
m_CycleOffsetParameterActive: 0
m_TimeParameterActive: 0
m_Motion: {fileID: 7400000, guid: 7a9c98e272a85bb4bbc7ba254608d785, type: 2}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!1102 &-932873167108066184
AnimatorState:
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: FanFaceAngry
m_Speed: 1
m_CycleOffset: 0
m_Transitions: []
m_StateMachineBehaviours: []
m_Position: {x: 50, y: 50, z: 0}
m_IKOnFeet: 0
m_WriteDefaultValues: 1
m_Mirror: 0
m_SpeedParameterActive: 0
m_MirrorParameterActive: 0
m_CycleOffsetParameterActive: 0
m_TimeParameterActive: 0
m_Motion: {fileID: 7400000, guid: f5e488a04143be84dbf3d5a6d7189f6e, type: 2}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!91 &9100000
AnimatorController:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: FanHead
serializedVersion: 5
m_AnimatorParameters: []
m_AnimatorLayers:
- serializedVersion: 5
m_Name: Base Layer
m_StateMachine: {fileID: 5357283818368347587}
m_Mask: {fileID: 0}
m_Motions: []
m_Behaviours: []
m_BlendingMode: 0
m_SyncedLayerIndex: -1
m_DefaultWeight: 0
m_IKPass: 0
m_SyncedLayerAffectsTiming: 0
m_Controller: {fileID: 9100000}
--- !u!1107 &5357283818368347587
AnimatorStateMachine:
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Base Layer
m_ChildStates:
- serializedVersion: 1
m_State: {fileID: -4496796211826292596}
m_Position: {x: 300, y: 120, z: 0}
- serializedVersion: 1
m_State: {fileID: -932873167108066184}
m_Position: {x: 300, y: 200, z: 0}
m_ChildStateMachines: []
m_AnyStateTransitions: []
m_EntryTransitions: []
m_StateMachineTransitions: {}
m_StateMachineBehaviours: []
m_AnyStatePosition: {x: 50, y: 20, z: 0}
m_EntryPosition: {x: 50, y: 120, z: 0}
m_ExitPosition: {x: 800, y: 120, z: 0}
m_ParentStateMachinePosition: {x: 800, y: 20, z: 0}
m_DefaultState: {fileID: -4496796211826292596}

File diff suppressed because it is too large Load diff

View file

@ -257,6 +257,7 @@ namespace HeavenStudio.Games
//spawn 12, the 4th is our player (idx 3)
Vector3 origin = spectatorAnchor.transform.localPosition;
int sortOrigin = spectatorAnchor.GetComponent<SortingGroup>().sortingOrder;
int row = 1;
Vector3 spawnPos = new Vector3(origin.x, origin.y, origin.z);
spawnPos.x -= RADIUS * 2 * 3;
for (int i = 0; i < FAN_COUNT; i++)
@ -264,7 +265,8 @@ namespace HeavenStudio.Games
GameObject mobj = Instantiate(spectator, spectatorAnchor.transform.parent);
NtrIdolFan fan = mobj.GetComponent<NtrIdolFan>();
mobj.transform.localPosition = new Vector3(spawnPos.x, spawnPos.y, spawnPos.z);
mobj.GetComponent<SortingGroup>().sortingOrder = i + sortOrigin;
fan.SetRow(row, sortOrigin);
// mobj.GetComponent<SortingGroup>().sortingOrder = i + sortOrigin;
if (i == 3)
{
Player = fan;
@ -283,7 +285,7 @@ namespace HeavenStudio.Games
spawnPos = new Vector3(origin.x, origin.y, origin.z);
spawnPos.x -= RADIUS * 2 * 4 - RADIUS;
spawnPos.y -= RADIUS;
// spawnPos.z -= RADIUS/4;
row++;
}
}

View file

@ -1,6 +1,7 @@
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
using UnityEngine.Rendering; //don't ask
using System;
using NaughtyBezierCurves;
@ -15,8 +16,8 @@ namespace HeavenStudio.Games.Scripts_FanClub
[Header("References")]
[SerializeField] private GameObject motionRoot;
[SerializeField] private GameObject headRoot;
[SerializeField] private SortingGroup sortingGroup;
public Animator animator;
public Animator headAnimator;
public ParticleSystem fanClapEffect;
public GameObject shadow;
@ -273,11 +274,19 @@ namespace HeavenStudio.Games.Scripts_FanClub
public void MakeAngry(bool flip = false)
{
headAnimator.Play("FanFaceAngry", -1, 0);
if (flip)
{
headRoot.transform.localScale = new Vector3(-1f, 1f, 1f);
}
animator.Play("Head.FanFaceAngryFlip", -1, 0);
}
else
{
animator.Play("Head.FanFaceAngry", -1, 0);
}
}
public void SetRow(int row, int origin = 0)
{
sortingGroup.sortingOrder = origin + row;
}
}
}

View file

@ -194,5 +194,7 @@ MonoBehaviour:
- Assets/Scripts/Games/NailCarpenter/Sweet.cs
- Assets/Scripts/Games/NailCarpenter/NailCarpenter.cs
- Assets/Scripts/Games/PlayerActionEvent.cs
- Assets/Scripts/Games/FanClub/FanClub.cs
- Assets/Scripts/Games/FanClub/NtrIdolFan.cs
PathsToSkipImportEvent: []
PathsToIgnoreOverwriteSettingOnAttribute: []