Merge branch 'dev_20230919' of http://git.juzugame.com/b6-client/b6-unity into dev_20230919

Assets/arts/spines/characters/p0003/p0003.atlas.txt

@@ -2,50 +2,47 @@ p0003.png
 size:512,512
 filter:Linear,Linear
 eye_L
-bounds:134,278,12,23
+bounds:117,256,12,22
 eye_R
-bounds:68,217,12,22
+bounds:29,137,12,22
 rotate:90
 eye_xuanyun
-bounds:103,236,22,22
+bounds:2,79,22,22
 gutou
-bounds:263,457,70,53
-hand_L_1
-bounds:68,231,33,27
+bounds:29,151,70,53
 hand_L_2
-bounds:303,426,29,29
-offsets:0,1,29,30
-hand_L_3
-bounds:373,486,24,24
+bounds:146,384,43,45
+rotate:90
 hand_R
-bounds:263,408,38,47
+bounds:240,389,45,38
 hand_R_1
-bounds:29,135,25,24
+bounds:139,319,26,23
 head_1
-bounds:149,400,112,110
+bounds:2,280,135,106
 head_2
-bounds:68,303,91,79
-rotate:90
+bounds:293,430,89,76
 hit_yan1
-bounds:303,408,16,18
-rotate:90
+bounds:28,117,16,18
 kulou
-bounds:2,2,77,62
+bounds:384,444,77,62
 offsets:0,1,77,63
 leg_L
-bounds:29,161,36,46
+bounds:193,388,39,45
+rotate:90
 leg_R
-bounds:335,464,36,46
+bounds:139,344,36,38
 spine_1
-bounds:149,312,84,86
+bounds:29,206,86,72
 spine_2
-bounds:2,396,145,114
+bounds:2,388,142,118
 spine_3
-bounds:68,260,64,41
+bounds:463,441,65,43
+rotate:90
 weapon_1
-bounds:2,209,64,185
+bounds:146,429,77,145
+rotate:90
 yinying
-bounds:2,66,141,25
+bounds:2,137,141,25
 rotate:90
 zui
-bounds:235,366,24,32
+bounds:2,103,24,32

Assets/arts/spines/characters/p0006/p0006.atlas.txt

@@ -1,58 +1,59 @@
 p0006.png
 size:512,512
 filter:Linear,Linear
-bird
-bounds:158,348,49,39
-offsets:1,1,51,41
 eye_L
-bounds:39,2,13,24
+bounds:408,440,13,24
 offsets:1,1,15,26
 rotate:90
 eye_R
-bounds:209,363,13,24
+bounds:487,458,13,24
 offsets:1,1,15,26
 eye_xuanyun
-bounds:39,17,22,22
-flower
-bounds:2,2,35,37
-offsets:1,1,37,39
+bounds:219,377,22,22
 gutou
-bounds:304,391,70,53
+bounds:60,11,70,53
 rotate:90
 hand_L
-bounds:97,348,59,39
-hand_R
-bounds:93,280,26,29
-offsets:1,1,28,31
-head_1
-bounds:2,230,117,89
-offsets:1,1,119,91
+bounds:60,83,67,57
 rotate:90
+hand_R
+bounds:189,372,27,28
+rotate:90
+head_1
+bounds:254,432,107,77
 head_2
-bounds:97,389,125,121
+bounds:130,401,122,108
 head_3
-bounds:224,463,135,47
-offsets:1,1,137,49
+bounds:2,2,90,56
+rotate:90
 hit_yan1
-bounds:359,443,16,18
+bounds:335,412,16,18
 hit_yan2
-bounds:361,463,20,20
+bounds:313,410,20,20
+huarui
+bounds:408,455,43,27
 kulou
-bounds:2,41,77,62
+bounds:60,152,77,62
 offsets:0,1,77,63
 rotate:90
 spine_1
-bounds:224,388,78,73
+bounds:2,231,133,119
+rotate:90
 spine_2
-bounds:2,120,108,60
+bounds:2,94,135,56
+rotate:90
+toufa1
+bounds:130,378,21,57
+rotate:90
+toufa2
+bounds:254,410,20,57
 rotate:90
 upperarm_R
-bounds:93,311,38,35
-offsets:1,1,40,37
+bounds:363,433,43,49
 weapon_1
-bounds:2,349,93,161
-offsets:1,1,95,163
+bounds:2,366,126,143
 yinying
-bounds:361,485,141,25
+bounds:363,484,141,25
 zui
-bounds:64,196,24,32
+bounds:453,458,24,32
+rotate:90

Assets/arts/spines/characters/p0007/p0007.atlas.txt

@@ -2,52 +2,68 @@ p0007.png
 size:512,512
 filter:Linear,Linear
 eye_L
-bounds:213,409,10,21
-rotate:90
+bounds:2,2,10,21
 eye_R
-bounds:180,318,10,21
+bounds:14,2,10,21
 eye_xuanyun
-bounds:356,488,22,22
+bounds:77,64,22,22
 guang
-bounds:2,6,28,61
-rotate:90
+bounds:324,411,66,72
 gutou
-bounds:108,286,70,53
+bounds:2,115,70,53
 hand_L
-bounds:108,245,39,65
+bounds:74,116,23,26
 rotate:90
 hand_R
-bounds:94,180,37,63
+bounds:77,88,23,26
 head
-bounds:108,404,103,106
+bounds:2,234,91,79
 head_1
-bounds:2,124,139,90
-rotate:90
+bounds:207,408,115,102
+head_2
+bounds:102,395,103,115
 hit_yan1
-bounds:192,384,16,18
+bounds:26,2,16,18
 hit_yan2
-bounds:380,490,20,20
+bounds:431,417,20,20
 hit_yan3
-bounds:135,157,28,28
+bounds:248,378,28,28
 kulou
-bounds:213,421,77,62
+bounds:2,170,77,62
 offsets:0,1,77,63
-leg_L
-bounds:133,187,39,56
-leg_R
-bounds:94,122,39,56
-spine_1
-bounds:2,36,79,86
-spine_2
-bounds:108,341,82,61
-spine_3
-bounds:292,435,72,48
-weapon_1
-bounds:2,265,104,245
-yinying
-bounds:213,485,141,25
-zui
-bounds:65,2,24,32
-zui1
-bounds:135,126,29,27
+leg_l_1
+bounds:392,439,52,44
+leg_l_2
+bounds:178,356,31,37
+leg_r_1
+bounds:31,61,52,44
 rotate:90
+leg_r_2
+bounds:392,406,31,37
+rotate:90
+sheng_1
+bounds:278,379,27,29
+rotate:90
+sheng_2
+bounds:81,170,28,28
+spine_1
+bounds:102,323,74,70
+upperarm_l_01
+bounds:467,473,43,37
+upperarm_l_02
+bounds:178,318,36,36
+upperarm_r_01
+bounds:31,22,43,37
+upperarm_r_02
+bounds:211,370,35,36
+weapon_1
+bounds:2,315,98,195
+yaodai
+bounds:2,25,88,27
+rotate:90
+yinying
+bounds:324,485,141,25
+zui
+bounds:81,200,24,32
+zui1
+bounds:74,141,29,27

Assets/arts/spines/characters/p0008/p0008.atlas.txt

@@ -2,59 +2,63 @@ p0008.png
 size:512,512
 filter:Linear,Linear
 eye_L
-bounds:491,486,12,24
-offsets:1,1,14,26
+bounds:223,316,12,23
+rotate:90
 eye_R
-bounds:77,20,12,24
-offsets:1,1,14,26
+bounds:131,71,12,23
 eye_xuanyun
-bounds:183,133,22,22
+bounds:429,460,22,22
 gutou
-bounds:446,394,70,53
-rotate:90
+bounds:2,50,70,53
 hand_L
-bounds:363,338,58,53
-hand_R
-bounds:2,14,73,30
-head_1
-bounds:259,410,109,100
-offsets:1,1,111,102
-head_2
-bounds:2,133,179,128
-hit_yan1
-bounds:491,466,16,18
-hit_yan2
-bounds:178,111,20,20
-kulou
-bounds:92,2,77,62
-offsets:0,1,77,63
-leg_L
-bounds:327,286,33,59
-leg_R
-bounds:327,347,34,61
-spine_1
-bounds:92,66,84,65
-offsets:1,1,86,67
-spine_2
-bounds:370,393,71,74
+bounds:89,128,62,53
 rotate:90
+hand_R
+bounds:310,427,59,55
+head
+bounds:223,330,89,76
+rotate:90
+head_1
+bounds:223,421,85,88
+head_2
+bounds:2,192,144,120
+hit_yan1
+bounds:429,442,16,18
+rotate:90
+hit_yan2
+bounds:144,128,20,20
+jian_l
+bounds:2,2,61,46
+jian_r
+bounds:144,150,53,40
+kulou
+bounds:148,235,77,62
+offsets:0,1,77,63
+rotate:90
+leg_L
+bounds:453,474,35,55
+rotate:90
+leg_R
+bounds:89,96,30,58
+rotate:90
+spine_2
+bounds:2,105,85,85
 weapon_1
-bounds:2,46,88,85
-offsets:1,1,90,87
+bounds:74,58,36,55
+rotate:90
 weapon_2
-bounds:286,291,39,117
-offsets:1,1,41,119
+bounds:371,409,35,54
+rotate:90
 weapon_3
-bounds:370,466,44,119
-offsets:1,1,46,121
+bounds:371,446,36,56
 rotate:90
 weapon_4
-bounds:183,157,65,104
-offsets:1,1,67,106
-xuying
-bounds:2,263,255,247
-yinying
-bounds:259,267,141,25
+bounds:148,192,41,62
 rotate:90
+xuying
+bounds:2,314,219,195
+offsets:1,1,221,196
+yinying
+bounds:310,484,141,25
 zui1
-bounds:362,309,29,27
+bounds:166,121,29,27

Assets/arts/spines/characters/p0009/p0009.atlas.txt

@@ -2,60 +2,56 @@ p0009.png
 size:512,512
 filter:Linear,Linear
 eye_L
-bounds:218,320,10,23
+bounds:91,207,10,23
 offsets:1,1,12,25
 eye_R
-bounds:196,275,10,23
+bounds:195,324,10,23
 offsets:1,1,12,25
 eye_xuanyun
-bounds:2,2,22,22
+bounds:110,235,22,22
 gutou
-bounds:337,416,70,53
+bounds:29,93,70,53
+rotate:90
 hand_L
-bounds:409,441,64,55
+bounds:110,259,62,52
+rotate:90
 hand_R
-bounds:409,395,44,50
-offsets:1,1,46,52
+bounds:389,457,52,64
 rotate:90
 head
-bounds:158,409,106,87
-offsets:1,1,108,89
+bounds:2,232,106,89
 hit_yan1
-bounds:65,117,16,18
+bounds:240,393,16,18
 hit_yan2
-bounds:475,476,20,20
+bounds:164,301,20,20
 kulou
-bounds:158,345,77,62
+bounds:161,349,77,62
 offsets:0,1,77,63
 leg_L
-bounds:2,26,63,69
+bounds:258,444,60,65
 leg_R
-bounds:266,405,64,69
-rotate:90
+bounds:29,165,60,65
 sipne_1
-bounds:2,205,100,100
+bounds:161,413,95,96
 spine_2
-bounds:104,239,66,40
+bounds:2,31,56,38
 rotate:90
 spine_3
-bounds:65,137,66,40
-rotate:90
+bounds:258,404,63,38
 spine_4
-bounds:2,97,106,61
-rotate:90
+bounds:320,452,67,57
 upperarm_L_1
-bounds:146,250,48,48
-offsets:1,1,50,50
+bounds:455,462,46,47
 upperarm_R_1
-bounds:158,300,43,58
-offsets:1,1,45,60
+bounds:323,409,41,56
 rotate:90
 xuying
-bounds:2,307,154,189
+bounds:2,323,157,186
 yinying
-bounds:266,471,141,25
-zui
-bounds:104,205,24,32
-zui1
-bounds:237,378,29,27
+bounds:2,89,141,25
 rotate:90
+zui
+bounds:161,323,24,32
+rotate:90
+zui1
+bounds:2,2,29,27

Assets/arts/spines/characters/p0012/p0012.atlas.txt

@@ -2,67 +2,64 @@ p0012.png
 size:512,512
 filter:Linear,Linear
 eye_L
-bounds:2,4,13,25
+bounds:84,41,13,25
 offsets:1,1,15,27
-rotate:90
 eye_R
-bounds:257,278,12,25
+bounds:397,431,12,25
 offsets:1,1,14,27
+rotate:90
 eye_xuanyun
-bounds:486,486,22,22
+bounds:133,129,22,22
 gutou
-bounds:206,305,70,53
+bounds:230,292,70,53
 hand_L
-bounds:438,445,35,36
-offsets:1,1,37,38
+bounds:153,187,32,31
 hand_R
-bounds:85,143,36,33
-offsets:1,1,38,35
-head_1
-bounds:191,233,64,70
+bounds:133,153,26,27
 head_2
-bounds:206,435,135,73
-offsets:1,1,137,75
+bounds:230,428,165,79
 head_3
-bounds:2,19,85,62
-offsets:1,1,87,64
+bounds:153,220,97,66
+rotate:90
 head_4
-bounds:2,83,94,81
-offsets:1,1,96,83
-rotate:90
+bounds:230,347,91,79
 head_5
-bounds:89,207,100,100
+bounds:2,200,149,117
 hit_yan1
-bounds:123,158,16,18
+bounds:133,182,16,18
+rotate:90
 hit_yan2
-bounds:191,211,20,20
+bounds:84,68,20,20
 kulou
-bounds:287,356,77,62
+bounds:397,445,77,62
 offsets:0,1,77,63
-rotate:90
 leg_L
-bounds:278,287,67,67
+bounds:221,224,57,66
 leg_R
-bounds:351,368,67,67
+bounds:302,282,55,66
+rotate:90
 spine_1
-bounds:206,360,79,73
+bounds:2,5,80,83
+spine_2
+bounds:280,232,59,48
+spine_3
+bounds:323,339,87,50
+rotate:90
 upperarm_L_01
-bounds:401,442,35,39
-offsets:1,1,37,41
+bounds:476,456,51,31
+rotate:90
 upperarm_L_02
-bounds:89,178,27,41
-offsets:1,1,29,43
-rotate:90
+bounds:375,386,28,40
 upperarm_R_01
-bounds:343,437,44,56
-offsets:1,1,46,58
-rotate:90
+bounds:341,238,35,42
+upperarm_R_02
+bounds:375,345,37,39
 weapon_1
-bounds:2,179,85,128
-offsets:1,1,87,130
+bounds:2,90,102,108
 xuying
-bounds:2,309,202,199
+bounds:2,319,226,188
 yinying
-bounds:343,483,141,25
+bounds:106,57,141,25
+rotate:90
 zui1
-bounds:132,178,29,27
+bounds:187,191,29,27

Assets/arts/spines/characters/p0014/p0014.atlas.txt

@@ -1,56 +1,62 @@
 p0014.png
 size:512,512
 filter:Linear,Linear
+bin_1
+bounds:259,321,14,52
+bin_2
+bounds:244,415,15,52
+rotate:90
 canying
-bounds:2,288,132,118
-offsets:0,1,133,119
+bounds:2,264,161,144
+offsets:0,0,162,147
 eye_L
-bounds:2,4,9,21
+bounds:139,151,9,20
 rotate:90
 eye_R
-bounds:216,301,9,21
-eye_xuanyun
-bounds:109,76,22,22
-gutou
-bounds:122,164,70,53
-hand_L
-bounds:296,389,36,38
+bounds:254,276,9,20
 rotate:90
-head_1
-bounds:369,426,93,57
+eye_xuanyun
+bounds:275,323,22,22
+gutou
+bounds:89,69,70,53
+rotate:90
+hand_L
+bounds:259,375,35,38
 head_2
-bounds:249,427,118,83
+bounds:337,441,88,69
 head_3
-bounds:136,324,94,82
+bounds:244,432,91,78
 hit_yan1
-bounds:91,58,16,18
+bounds:192,250,16,18
 hit_yan2
-bounds:87,78,20,20
+bounds:170,245,20,20
 kulou
-bounds:122,219,77,62
+bounds:427,448,77,62
 offsets:0,1,77,63
 leg_L
-bounds:87,100,51,61
-leg_R
-bounds:140,101,51,61
-spine_1
-bounds:2,163,118,123
-spine_2
-bounds:2,15,60,87
+bounds:192,270,49,60
 rotate:90
+leg_R
+bounds:95,7,49,60
+mao
+bounds:275,347,20,26
+spine_1
+bounds:192,321,65,87
+spine_2
+bounds:2,141,135,121
 spine_3
-bounds:2,77,83,84
+bounds:2,56,85,83
 spine_4
-bounds:136,283,78,39
+bounds:2,2,91,52
 upperarm_L_01
-bounds:464,428,55,30
+bounds:139,208,54,29
 rotate:90
 upperarm_L_02
-bounds:249,391,34,45
-rotate:90
+bounds:139,162,32,44
 weapon_1
-bounds:2,408,245,102
+bounds:2,410,240,100
 yinying
-bounds:369,485,141,25
+bounds:165,267,141,25
+rotate:90
 zui
-bounds:336,393,24,32
+bounds:254,287,24,32

Assets/prefabs/ui/activity/full_moon/full_moon_ui.prefab

@@ -916,140 +916,6 @@ RectTransform:
   m_AnchoredPosition: {x: 0, y: 345}
   m_SizeDelta: {x: -20, y: 160}
   m_Pivot: {x: 0.5, y: 0.5}
---- !u!1 &728267976897510249
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 1345679511063232807}
-  - component: {fileID: 7396926607468616129}
-  - component: {fileID: 7464351457279212278}
-  m_Layer: 5
-  m_Name: tx_reward_name
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!224 &1345679511063232807
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 728267976897510249}
-  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_Children: []
-  m_Father: {fileID: 4594480272095472130}
-  m_RootOrder: 3
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0.5, y: 0.5}
-  m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 210, y: 65}
-  m_SizeDelta: {x: 90, y: 50}
-  m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &7396926607468616129
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 728267976897510249}
-  m_CullTransparentMesh: 1
---- !u!114 &7464351457279212278
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 728267976897510249}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 1, b: 1, a: 1}
-  m_RaycastTarget: 1
-  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
-  m_Maskable: 1
-  m_OnCullStateChanged:
-    m_PersistentCalls:
-      m_Calls: []
-  m_text: 
-  m_isRightToLeft: 0
-  m_fontAsset: {fileID: 11400000, guid: 9d1aadd9ebaf54ce2b217ab8427fa0db, type: 2}
-  m_sharedMaterial: {fileID: 2100000, guid: d9526b8cb4bc030488db413ef429c6f9, type: 2}
-  m_fontSharedMaterials: []
-  m_fontMaterial: {fileID: 0}
-  m_fontMaterials: []
-  m_fontColor32:
-    serializedVersion: 2
-    rgba: 4294967295
-  m_fontColor: {r: 1, g: 1, b: 1, a: 1}
-  m_enableVertexGradient: 0
-  m_colorMode: 3
-  m_fontColorGradient:
-    topLeft: {r: 1, g: 1, b: 1, a: 1}
-    topRight: {r: 1, g: 1, b: 1, a: 1}
-    bottomLeft: {r: 1, g: 1, b: 1, a: 1}
-    bottomRight: {r: 1, g: 1, b: 1, a: 1}
-  m_fontColorGradientPreset: {fileID: 0}
-  m_spriteAsset: {fileID: 0}
-  m_tintAllSprites: 0
-  m_StyleSheet: {fileID: 0}
-  m_TextStyleHashCode: -1183493901
-  m_overrideHtmlColors: 0
-  m_faceColor:
-    serializedVersion: 2
-    rgba: 4294967295
-  m_fontSize: 18
-  m_fontSizeBase: 18
-  m_fontWeight: 400
-  m_enableAutoSizing: 0
-  m_fontSizeMin: 18
-  m_fontSizeMax: 30
-  m_fontStyle: 0
-  m_HorizontalAlignment: 2
-  m_VerticalAlignment: 512
-  m_textAlignment: 65535
-  m_characterSpacing: 0
-  m_wordSpacing: 0
-  m_lineSpacing: 0
-  m_lineSpacingMax: 0
-  m_paragraphSpacing: 0
-  m_charWidthMaxAdj: 0
-  m_enableWordWrapping: 1
-  m_wordWrappingRatios: 0.4
-  m_overflowMode: 0
-  m_linkedTextComponent: {fileID: 0}
-  parentLinkedComponent: {fileID: 0}
-  m_enableKerning: 1
-  m_enableExtraPadding: 0
-  checkPaddingRequired: 0
-  m_isRichText: 1
-  m_parseCtrlCharacters: 1
-  m_isOrthographic: 1
-  m_isCullingEnabled: 0
-  m_horizontalMapping: 0
-  m_verticalMapping: 0
-  m_uvLineOffset: 0
-  m_geometrySortingOrder: 0
-  m_IsTextObjectScaleStatic: 0
-  m_VertexBufferAutoSizeReduction: 0
-  m_useMaxVisibleDescender: 1
-  m_pageToDisplay: 1
-  m_margin: {x: 0, y: 0, z: 0, w: 0}
-  m_isUsingLegacyAnimationComponent: 0
-  m_isVolumetricText: 0
-  m_hasFontAssetChanged: 0
-  m_baseMaterial: {fileID: 0}
-  m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
 --- !u!1 &843371757749215714
 GameObject:
   m_ObjectHideFlags: 0
@@ -2858,11 +2724,11 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 4594480272095472130}
-  m_RootOrder: 5
+  m_RootOrder: 4
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 223, y: 27}
+  m_AnchoredPosition: {x: 223, y: 35}
   m_SizeDelta: {x: 90, y: 50}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &3904361799743626630
@@ -8114,11 +7980,11 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 4594480272095472130}
-  m_RootOrder: 4
+  m_RootOrder: 3
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 184.31, y: 25}
+  m_AnchoredPosition: {x: 184.31, y: 35}
   m_SizeDelta: {x: 50, y: 50}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &4553242798139655203
@@ -9690,7 +9556,7 @@ RectTransform:
   m_Children:
   - {fileID: 7440413413259263750}
   m_Father: {fileID: 4594480272095472130}
-  m_RootOrder: 6
+  m_RootOrder: 5
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
@@ -12660,7 +12526,6 @@ RectTransform:
   - {fileID: 5519724965991116837}
   - {fileID: 3195909844900069282}
   - {fileID: 1144750537972462758}
-  - {fileID: 1345679511063232807}
   - {fileID: 6801524934344051175}
   - {fileID: 656766481700344223}
   - {fileID: 493629628466694251}
@@ -12705,10 +12570,6 @@ MonoBehaviour:
     hashName: 3740460993
     objectType: 0
     gameObject: {fileID: 208262776719838011}
-  - name: full_moon_task_cell.tx_reward_name
-    hashName: 2986620544
-    objectType: 0
-    gameObject: {fileID: 728267976897510249}
   - name: full_moon_task_cell.tx_num
     hashName: 4138962283
     objectType: 0
@@ -14587,16 +14448,16 @@ PrefabInstance:
       objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 4f7cf840d6e73e14781807788b817568, type: 3}
---- !u!1 &4186240350304379912 stripped
-GameObject:
-  m_CorrespondingSourceObject: {fileID: 1991971382385470840, guid: 4f7cf840d6e73e14781807788b817568, type: 3}
-  m_PrefabInstance: {fileID: 2430927851539188080}
-  m_PrefabAsset: {fileID: 0}
 --- !u!224 &669765129708774126 stripped
 RectTransform:
   m_CorrespondingSourceObject: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3}
   m_PrefabInstance: {fileID: 2430927851539188080}
   m_PrefabAsset: {fileID: 0}
+--- !u!1 &4186240350304379912 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 1991971382385470840, guid: 4f7cf840d6e73e14781807788b817568, type: 3}
+  m_PrefabInstance: {fileID: 2430927851539188080}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1001 &2707185851418522357
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -15056,16 +14917,16 @@ PrefabInstance:
       objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: defbf60b7b35ff34c9951fe14076b26b, type: 3}
---- !u!1 &1228836703075703573 stripped
-GameObject:
-  m_CorrespondingSourceObject: {fileID: 2640268199977609927, guid: defbf60b7b35ff34c9951fe14076b26b, type: 3}
-  m_PrefabInstance: {fileID: 3866808160658846162}
-  m_PrefabAsset: {fileID: 0}
 --- !u!224 &696400375647719087 stripped
 RectTransform:
   m_CorrespondingSourceObject: {fileID: 4324500158412275581, guid: defbf60b7b35ff34c9951fe14076b26b, type: 3}
   m_PrefabInstance: {fileID: 3866808160658846162}
   m_PrefabAsset: {fileID: 0}
+--- !u!1 &1228836703075703573 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 2640268199977609927, guid: defbf60b7b35ff34c9951fe14076b26b, type: 3}
+  m_PrefabInstance: {fileID: 3866808160658846162}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1001 &4304176191250758817
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -15676,16 +15537,16 @@ PrefabInstance:
       objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: defbf60b7b35ff34c9951fe14076b26b, type: 3}
---- !u!224 &8858133946987545425 stripped
-RectTransform:
-  m_CorrespondingSourceObject: {fileID: 4324500158412275581, guid: defbf60b7b35ff34c9951fe14076b26b, type: 3}
-  m_PrefabInstance: {fileID: 5110983178614291500}
-  m_PrefabAsset: {fileID: 0}
 --- !u!1 &7082405122418005739 stripped
 GameObject:
   m_CorrespondingSourceObject: {fileID: 2640268199977609927, guid: defbf60b7b35ff34c9951fe14076b26b, type: 3}
   m_PrefabInstance: {fileID: 5110983178614291500}
   m_PrefabAsset: {fileID: 0}
+--- !u!224 &8858133946987545425 stripped
+RectTransform:
+  m_CorrespondingSourceObject: {fileID: 4324500158412275581, guid: defbf60b7b35ff34c9951fe14076b26b, type: 3}
+  m_PrefabInstance: {fileID: 5110983178614291500}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1001 &6063313175581245639
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -16097,16 +15958,16 @@ PrefabInstance:
       objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: defbf60b7b35ff34c9951fe14076b26b, type: 3}
---- !u!224 &6576988418415400519 stripped
-RectTransform:
-  m_CorrespondingSourceObject: {fileID: 4324500158412275581, guid: defbf60b7b35ff34c9951fe14076b26b, type: 3}
-  m_PrefabInstance: {fileID: 7441527568836766010}
-  m_PrefabAsset: {fileID: 0}
 --- !u!1 &4891331502105052157 stripped
 GameObject:
   m_CorrespondingSourceObject: {fileID: 2640268199977609927, guid: defbf60b7b35ff34c9951fe14076b26b, type: 3}
   m_PrefabInstance: {fileID: 7441527568836766010}
   m_PrefabAsset: {fileID: 0}
+--- !u!224 &6576988418415400519 stripped
+RectTransform:
+  m_CorrespondingSourceObject: {fileID: 4324500158412275581, guid: defbf60b7b35ff34c9951fe14076b26b, type: 3}
+  m_PrefabInstance: {fileID: 7441527568836766010}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1001 &7596836884579361984
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -16514,16 +16375,16 @@ PrefabInstance:
       objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 4f7cf840d6e73e14781807788b817568, type: 3}
---- !u!1 &7653113632645028371 stripped
-GameObject:
-  m_CorrespondingSourceObject: {fileID: 1991971382385470840, guid: 4f7cf840d6e73e14781807788b817568, type: 3}
-  m_PrefabInstance: {fileID: 8183521173029910379}
-  m_PrefabAsset: {fileID: 0}
 --- !u!224 &6442024266730904821 stripped
 RectTransform:
   m_CorrespondingSourceObject: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3}
   m_PrefabInstance: {fileID: 8183521173029910379}
   m_PrefabAsset: {fileID: 0}
+--- !u!1 &7653113632645028371 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 1991971382385470840, guid: 4f7cf840d6e73e14781807788b817568, type: 3}
+  m_PrefabInstance: {fileID: 8183521173029910379}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1001 &8262502798342429086
 PrefabInstance:
   m_ObjectHideFlags: 0