ybx_Gdn 9 ماه پیش
والد
کامیت
4ec5b32dab

+ 354 - 20
Assets/Content/Prefabs/UI/GridViewItem/ClimbingTowerRankItem.prefab

@@ -273,7 +273,6 @@ GameObject:
   - component: {fileID: 6175729793698872510}
   - component: {fileID: 7707191678532654173}
   - component: {fileID: 3981408208891233713}
-  - component: {fileID: 859588830767189474}
   m_Layer: 5
   m_Name: NameText
   m_TagString: Untagged
@@ -299,7 +298,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 0.5}
   m_AnchorMax: {x: 0, y: 0.5}
   m_AnchoredPosition: {x: 340, y: 25}
-  m_SizeDelta: {x: 0, y: 44}
+  m_SizeDelta: {x: 220, y: 44}
   m_Pivot: {x: 0, y: 0.5}
 --- !u!222 &1887817038535084052
 CanvasRenderer:
@@ -333,9 +332,9 @@ MonoBehaviour:
     m_Font: {fileID: 12800000, guid: 90ed5292e87d8a64aac7038df97ece85, type: 3}
     m_FontSize: 32
     m_FontStyle: 0
-    m_BestFit: 0
+    m_BestFit: 1
     m_MinSize: 2
-    m_MaxSize: 40
+    m_MaxSize: 32
     m_Alignment: 3
     m_AlignByGeometry: 0
     m_RichText: 1
@@ -362,8 +361,7 @@ MonoBehaviour:
   - UnityEngine.UI.Text
   - UINode
   - UnityEngine.UI.Outline
-  - UnityEngine.UI.ContentSizeFitter
-  values: 000001000000
+  values: 0000010000
   depObjs:
   - {fileID: 0}
   activeType: 0
@@ -382,20 +380,6 @@ MonoBehaviour:
   m_EffectColor: {r: 0, g: 0, b: 0, a: 0.5}
   m_EffectDistance: {x: 1, y: -1}
   m_UseGraphicAlpha: 1
---- !u!114 &859588830767189474
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 484534268119618072}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_HorizontalFit: 2
-  m_VerticalFit: 0
 --- !u!1 &1525659106125914129
 GameObject:
   m_ObjectHideFlags: 0
@@ -661,6 +645,7 @@ RectTransform:
   - {fileID: 5248420626090619132}
   - {fileID: 6148414955562294399}
   - {fileID: 2153105275110972917}
+  - {fileID: 7364748304903306282}
   m_Father: {fileID: 0}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -780,6 +765,218 @@ MonoBehaviour:
   m_EffectColor: {r: 0.33333334, g: 0.36862746, b: 0.45490196, a: 0.3137255}
   m_EffectDistance: {x: 0, y: -5}
   m_UseGraphicAlpha: 1
+--- !u!1 &2890640901181609152
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 4414376740713248116}
+  - component: {fileID: 1898391527117026710}
+  - component: {fileID: 1130295303300368130}
+  - component: {fileID: 2669281779503441872}
+  - component: {fileID: 2524781599025380040}
+  m_Layer: 0
+  m_Name: Viewport
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &4414376740713248116
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2890640901181609152}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 0.5, y: 0.5, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children:
+  - {fileID: 4991684294722026481}
+  m_Father: {fileID: 7364748304903306282}
+  m_RootOrder: 0
+  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: 0, y: 15}
+  m_SizeDelta: {x: 428, y: 128}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &1898391527117026710
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2890640901181609152}
+  m_CullTransparentMesh: 1
+--- !u!114 &1130295303300368130
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2890640901181609152}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, 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_Sprite: {fileID: 10917, guid: 0000000000000000f000000000000000, type: 0}
+  m_Type: 1
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+--- !u!114 &2669281779503441872
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2890640901181609152}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 31a19414c41e5ae4aae2af33fee712f6, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_ShowMaskGraphic: 0
+--- !u!114 &2524781599025380040
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2890640901181609152}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 306cc8c2b49d7114eaa3623786fc2126, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_IgnoreLayout: 0
+  m_MinWidth: -1
+  m_MinHeight: -1
+  m_PreferredWidth: 428
+  m_PreferredHeight: 129
+  m_FlexibleWidth: -1
+  m_FlexibleHeight: -1
+  m_LayoutPriority: 1
+--- !u!1 &3828908919241679411
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 4991684294722026481}
+  - component: {fileID: 7845402133807360057}
+  - component: {fileID: 8984067977529076910}
+  - component: {fileID: 4154426377018124266}
+  m_Layer: 0
+  m_Name: Content
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &4991684294722026481
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3828908919241679411}
+  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_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 4414376740713248116}
+  m_RootOrder: 0
+  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: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 128}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &7845402133807360057
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3828908919241679411}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 8759edc0b8b4b3d4aa8ffef2482e17ee, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  UIName: 
+  keys:
+  - UnityEngine.RectTransform
+  - UINode
+  - UnityEngine.UI.ContentSizeFitter
+  - UnityEngine.UI.HorizontalLayoutGroup
+  values: 00000001
+  depObjs: []
+  activeType: 0
+--- !u!114 &8984067977529076910
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3828908919241679411}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_HorizontalFit: 2
+  m_VerticalFit: 0
+--- !u!114 &4154426377018124266
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3828908919241679411}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 30649d3a9faa99c48a7b1166b86bf2a0, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Padding:
+    m_Left: 0
+    m_Right: 0
+    m_Top: 0
+    m_Bottom: 0
+  m_ChildAlignment: 1
+  m_Spacing: 15
+  m_ChildForceExpandWidth: 0
+  m_ChildForceExpandHeight: 0
+  m_ChildControlWidth: 0
+  m_ChildControlHeight: 0
+  m_ChildScaleWidth: 0
+  m_ChildScaleHeight: 0
+  m_ReverseArrangement: 0
 --- !u!1 &4633655507395118341
 GameObject:
   m_ObjectHideFlags: 0
@@ -973,6 +1170,143 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
+--- !u!1 &5199960886713970065
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 7364748304903306282}
+  - component: {fileID: 3063274096293933355}
+  - component: {fileID: 5154860175943860339}
+  - component: {fileID: 626703853193437121}
+  - component: {fileID: 1010328887601267694}
+  m_Layer: 0
+  m_Name: RewordNode
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &7364748304903306282
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5199960886713970065}
+  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_ConstrainProportionsScale: 0
+  m_Children:
+  - {fileID: 4414376740713248116}
+  m_Father: {fileID: 1156079307327292845}
+  m_RootOrder: 13
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 1, y: 0.5}
+  m_AnchorMax: {x: 1, y: 0.5}
+  m_AnchoredPosition: {x: -145, y: 30}
+  m_SizeDelta: {x: 200, y: 80}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &3063274096293933355
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5199960886713970065}
+  m_CullTransparentMesh: 1
+--- !u!114 &5154860175943860339
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5199960886713970065}
+  m_Enabled: 0
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 0.392}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0}
+  m_Type: 1
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+--- !u!114 &626703853193437121
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5199960886713970065}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 7b8a986ea914e134996e17fd0c96dde3, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  totalCount: 0
+  reverseDirection: 0
+  rubberScale: 1
+  threshold: 100
+  lowGrid: 0
+  m_Cell: {fileID: 70813078944487029, guid: 72497a2a74d401f468ffb167fe95054d, type: 3}
+  m_Content: {fileID: 4991684294722026481}
+  m_Horizontal: 1
+  m_Vertical: 0
+  m_MovementType: 1
+  m_Elasticity: 0.1
+  m_Inertia: 1
+  m_DecelerationRate: 0.135
+  m_ScrollSensitivity: 1
+  m_Viewport: {fileID: 4414376740713248116}
+  m_HorizontalScrollbar: {fileID: 0}
+  m_VerticalScrollbar: {fileID: 0}
+  m_HorizontalScrollbarVisibility: 0
+  m_VerticalScrollbarVisibility: 0
+  m_HorizontalScrollbarSpacing: 0
+  m_VerticalScrollbarSpacing: 0
+  m_OnValueChanged:
+    m_PersistentCalls:
+      m_Calls: []
+--- !u!114 &1010328887601267694
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5199960886713970065}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 8759edc0b8b4b3d4aa8ffef2482e17ee, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  UIName: 
+  keys:
+  - UnityEngine.RectTransform
+  - UnityEngine.CanvasRenderer
+  - UnityEngine.UI.Image
+  - UnityEngine.UI.LoopHorizontalScrollRect
+  - UINode
+  values: 0000000100
+  depObjs: []
+  activeType: 0
 --- !u!1 &5202821712218003556
 GameObject:
   m_ObjectHideFlags: 0

+ 149 - 102
Assets/Content/Prefabs/UI/UIClimbingTower/UIClimbingTowerBattle.prefab

@@ -27,6 +27,7 @@ RectTransform:
   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_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 2811569801486649698}
   - {fileID: 7604424167704901640}
@@ -76,6 +77,7 @@ RectTransform:
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 0.8, y: 0.8, z: 1}
+  m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 1315465583835919707}
   m_RootOrder: 2
@@ -102,17 +104,17 @@ MonoBehaviour:
   m_GameObject: {fileID: 1118597448555489118}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
   m_Color: {r: 0.75294125, g: 0.854902, b: 1, a: 0.38431373}
   m_RaycastTarget: 0
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-    m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
-      Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
   m_Sprite: {fileID: 21300000, guid: c43c593988e761346af98a16514de2dc, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
@@ -122,6 +124,7 @@ MonoBehaviour:
   m_FillClockwise: 1
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
 --- !u!1 &1299526477849818509
 GameObject:
   m_ObjectHideFlags: 0
@@ -149,6 +152,7 @@ RectTransform:
   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_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 1617017429860361405}
   - {fileID: 1857638734992154876}
@@ -162,7 +166,7 @@ RectTransform:
   m_Pivot: {x: 0.5, y: 1}
 --- !u!95 &4970114072863040377
 Animator:
-  serializedVersion: 3
+  serializedVersion: 5
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
@@ -175,10 +179,12 @@ Animator:
   m_UpdateMode: 0
   m_ApplyRootMotion: 0
   m_LinearVelocityBlending: 0
+  m_StabilizeFeet: 0
   m_WarningMessage: 
   m_HasTransformHierarchy: 1
   m_AllowConstantClipSamplingOptimization: 1
-  m_KeepAnimatorControllerStateOnDisable: 0
+  m_KeepAnimatorStateOnDisable: 0
+  m_WriteDefaultValuesOnDisable: 0
 --- !u!1 &3408453691168150706
 GameObject:
   m_ObjectHideFlags: 0
@@ -207,6 +213,7 @@ RectTransform:
   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_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 1315465583835919707}
   m_RootOrder: 1
@@ -233,17 +240,17 @@ MonoBehaviour:
   m_GameObject: {fileID: 3408453691168150706}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
   m_Color: {r: 1, g: 1, b: 1, a: 1}
   m_RaycastTarget: 0
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-    m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
-      Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
   m_Sprite: {fileID: 21300000, guid: 88cbb352ddc6a4b419136ad5d044b7f0, type: 3}
   m_Type: 1
   m_PreserveAspect: 0
@@ -253,6 +260,7 @@ MonoBehaviour:
   m_FillClockwise: 1
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
 --- !u!1 &5303208233494673932
 GameObject:
   m_ObjectHideFlags: 0
@@ -281,6 +289,7 @@ RectTransform:
   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_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 1617017429860361405}
   m_RootOrder: 1
@@ -307,17 +316,17 @@ MonoBehaviour:
   m_GameObject: {fileID: 5303208233494673932}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
   m_Color: {r: 1, g: 1, b: 1, a: 1}
   m_RaycastTarget: 0
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-    m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
-      Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
   m_Sprite: {fileID: 21300000, guid: f75c0171621df774c87171a300c7f839, type: 3}
   m_Type: 1
   m_PreserveAspect: 0
@@ -327,6 +336,7 @@ MonoBehaviour:
   m_FillClockwise: 1
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
 --- !u!1 &5418892521828950385
 GameObject:
   m_ObjectHideFlags: 0
@@ -355,7 +365,8 @@ RectTransform:
   m_GameObject: {fileID: 5418892521828950385}
   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_LocalScale: {x: 0, y: 0, z: 0}
+  m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 3881359613462728112}
   - {fileID: 5551253224151222508}
@@ -384,6 +395,7 @@ Canvas:
   m_OverrideSorting: 0
   m_OverridePixelPerfect: 0
   m_SortingBucketNormalizedSize: 0
+  m_VertexColorAlwaysGammaSpace: 0
   m_AdditionalShaderChannelsFlag: 25
   m_SortingLayerID: 0
   m_SortingOrder: 0
@@ -397,7 +409,7 @@ MonoBehaviour:
   m_GameObject: {fileID: 5418892521828950385}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 1301386320, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+  m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
   m_IgnoreReversedGraphics: 1
@@ -452,6 +464,7 @@ RectTransform:
   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_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 6832750007464058437}
   m_RootOrder: 0
@@ -478,17 +491,17 @@ MonoBehaviour:
   m_GameObject: {fileID: 6220968321203167039}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
   m_Color: {r: 0.7802154, g: 0.801818, b: 0.8396226, a: 1}
   m_RaycastTarget: 0
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-    m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
-      Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
   m_Sprite: {fileID: 21300000, guid: f351140544601d746aaa6c5f6f26cda5, type: 3}
   m_Type: 2
   m_PreserveAspect: 0
@@ -498,6 +511,7 @@ MonoBehaviour:
   m_FillClockwise: 1
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
 --- !u!1 &7131453156343426543
 GameObject:
   m_ObjectHideFlags: 0
@@ -526,6 +540,7 @@ RectTransform:
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: -0.8, y: 0.8, z: 1}
+  m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 1315465583835919707}
   m_RootOrder: 3
@@ -552,17 +567,17 @@ MonoBehaviour:
   m_GameObject: {fileID: 7131453156343426543}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
   m_Color: {r: 0.75294125, g: 0.854902, b: 1, a: 0.38431373}
   m_RaycastTarget: 0
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-    m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
-      Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
   m_Sprite: {fileID: 21300000, guid: c43c593988e761346af98a16514de2dc, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
@@ -572,6 +587,7 @@ MonoBehaviour:
   m_FillClockwise: 1
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
 --- !u!1 &7319900223047683566
 GameObject:
   m_ObjectHideFlags: 0
@@ -599,6 +615,7 @@ RectTransform:
   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_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 5418892521828950389}
   m_RootOrder: 1
@@ -644,6 +661,7 @@ RectTransform:
   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_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 3961593011457773368}
   m_Father: {fileID: 1617017429860361405}
@@ -671,17 +689,17 @@ MonoBehaviour:
   m_GameObject: {fileID: 8165462610386640496}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
   m_Color: {r: 0.9411765, g: 0.9411765, b: 0.9411765, a: 1}
   m_RaycastTarget: 0
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-    m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
-      Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
   m_Sprite: {fileID: 21300000, guid: b874489686aab8448b0e249169837aef, type: 3}
   m_Type: 1
   m_PreserveAspect: 0
@@ -691,6 +709,7 @@ MonoBehaviour:
   m_FillClockwise: 1
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
 --- !u!1 &8459874571502518403
 GameObject:
   m_ObjectHideFlags: 0
@@ -719,6 +738,7 @@ RectTransform:
   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_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 1315465583835919707}
   m_RootOrder: 0
@@ -745,17 +765,17 @@ MonoBehaviour:
   m_GameObject: {fileID: 8459874571502518403}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
   m_Color: {r: 1, g: 1, b: 1, a: 1}
   m_RaycastTarget: 0
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-    m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
-      Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
   m_Sprite: {fileID: 21300000, guid: 88cbb352ddc6a4b419136ad5d044b7f0, type: 3}
   m_Type: 1
   m_PreserveAspect: 0
@@ -765,6 +785,7 @@ MonoBehaviour:
   m_FillClockwise: 1
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
 --- !u!1 &8642152671195188823
 GameObject:
   m_ObjectHideFlags: 0
@@ -791,6 +812,7 @@ RectTransform:
   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_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 6832750007464058437}
   - {fileID: 2863821436898561765}
@@ -818,6 +840,7 @@ GameObject:
   - component: {fileID: 4430452385658395796}
   - component: {fileID: 9181811145878064641}
   - component: {fileID: 6660635836280940005}
+  - component: {fileID: 4783347813415060084}
   m_Layer: 5
   m_Name: BoardTitle
   m_TagString: Untagged
@@ -835,6 +858,7 @@ RectTransform:
   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_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 1617017429860361405}
   m_RootOrder: 3
@@ -874,17 +898,17 @@ MonoBehaviour:
   m_GameObject: {fileID: 9209758636425281090}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
   m_Color: {r: 1, g: 1, b: 1, a: 1}
   m_RaycastTarget: 0
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-    m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
-      Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
   m_FontData:
     m_Font: {fileID: 12800000, guid: 90ed5292e87d8a64aac7038df97ece85, type: 3}
     m_FontSize: 40
@@ -898,7 +922,7 @@ MonoBehaviour:
     m_HorizontalOverflow: 0
     m_VerticalOverflow: 0
     m_LineSpacing: 1
-  m_Text: "\u8BD5\u70BC\u4E4B\u5854"
+  m_Text: "\u8BD5\u70BC"
 --- !u!114 &6660635836280940005
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -908,7 +932,7 @@ MonoBehaviour:
   m_GameObject: {fileID: 9209758636425281090}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 1679637790, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+  m_Script: {fileID: 11500000, guid: 306cc8c2b49d7114eaa3623786fc2126, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
   m_IgnoreLayout: 1
@@ -919,6 +943,29 @@ MonoBehaviour:
   m_FlexibleWidth: -1
   m_FlexibleHeight: -1
   m_LayoutPriority: 1
+--- !u!114 &4783347813415060084
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 9209758636425281090}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 8759edc0b8b4b3d4aa8ffef2482e17ee, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  UIName: 
+  keys:
+  - UnityEngine.RectTransform
+  - UnityEngine.CanvasRenderer
+  - UILocalizeScript
+  - UnityEngine.UI.Text
+  - UnityEngine.UI.LayoutElement
+  - UINode
+  values: 000001010000
+  depObjs: []
+  activeType: 0
 --- !u!1001 &5414469114329617192
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -933,107 +980,107 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 4416120186216355707, guid: 437498ee76288534297bd80193e188a1,
         type: 3}
-      propertyPath: m_LocalPosition.x
-      value: 0
+      propertyPath: m_Pivot.x
+      value: 0.5
       objectReference: {fileID: 0}
     - target: {fileID: 4416120186216355707, guid: 437498ee76288534297bd80193e188a1,
         type: 3}
-      propertyPath: m_LocalPosition.y
+      propertyPath: m_Pivot.y
       value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 4416120186216355707, guid: 437498ee76288534297bd80193e188a1,
         type: 3}
-      propertyPath: m_LocalPosition.z
-      value: 0
+      propertyPath: m_RootOrder
+      value: 4
       objectReference: {fileID: 0}
     - target: {fileID: 4416120186216355707, guid: 437498ee76288534297bd80193e188a1,
         type: 3}
-      propertyPath: m_LocalRotation.x
-      value: -0
+      propertyPath: m_AnchorMax.x
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 4416120186216355707, guid: 437498ee76288534297bd80193e188a1,
         type: 3}
-      propertyPath: m_LocalRotation.y
-      value: -0
+      propertyPath: m_AnchorMax.y
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 4416120186216355707, guid: 437498ee76288534297bd80193e188a1,
         type: 3}
-      propertyPath: m_LocalRotation.z
-      value: -0
+      propertyPath: m_AnchorMin.x
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 4416120186216355707, guid: 437498ee76288534297bd80193e188a1,
         type: 3}
-      propertyPath: m_LocalRotation.w
+      propertyPath: m_AnchorMin.y
       value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 4416120186216355707, guid: 437498ee76288534297bd80193e188a1,
         type: 3}
-      propertyPath: m_RootOrder
-      value: 4
+      propertyPath: m_SizeDelta.x
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 4416120186216355707, guid: 437498ee76288534297bd80193e188a1,
         type: 3}
-      propertyPath: m_LocalEulerAnglesHint.x
-      value: 0
+      propertyPath: m_SizeDelta.y
+      value: 240
       objectReference: {fileID: 0}
     - target: {fileID: 4416120186216355707, guid: 437498ee76288534297bd80193e188a1,
         type: 3}
-      propertyPath: m_LocalEulerAnglesHint.y
+      propertyPath: m_LocalPosition.x
       value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 4416120186216355707, guid: 437498ee76288534297bd80193e188a1,
         type: 3}
-      propertyPath: m_LocalEulerAnglesHint.z
+      propertyPath: m_LocalPosition.y
       value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 4416120186216355707, guid: 437498ee76288534297bd80193e188a1,
         type: 3}
-      propertyPath: m_AnchoredPosition.x
+      propertyPath: m_LocalPosition.z
       value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 4416120186216355707, guid: 437498ee76288534297bd80193e188a1,
         type: 3}
-      propertyPath: m_AnchoredPosition.y
-      value: 0
+      propertyPath: m_LocalRotation.w
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 4416120186216355707, guid: 437498ee76288534297bd80193e188a1,
         type: 3}
-      propertyPath: m_SizeDelta.x
-      value: 0
+      propertyPath: m_LocalRotation.x
+      value: -0
       objectReference: {fileID: 0}
     - target: {fileID: 4416120186216355707, guid: 437498ee76288534297bd80193e188a1,
         type: 3}
-      propertyPath: m_SizeDelta.y
-      value: 240
+      propertyPath: m_LocalRotation.y
+      value: -0
       objectReference: {fileID: 0}
     - target: {fileID: 4416120186216355707, guid: 437498ee76288534297bd80193e188a1,
         type: 3}
-      propertyPath: m_AnchorMin.x
-      value: 0
+      propertyPath: m_LocalRotation.z
+      value: -0
       objectReference: {fileID: 0}
     - target: {fileID: 4416120186216355707, guid: 437498ee76288534297bd80193e188a1,
         type: 3}
-      propertyPath: m_AnchorMin.y
-      value: 1
+      propertyPath: m_AnchoredPosition.x
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 4416120186216355707, guid: 437498ee76288534297bd80193e188a1,
         type: 3}
-      propertyPath: m_AnchorMax.x
-      value: 1
+      propertyPath: m_AnchoredPosition.y
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 4416120186216355707, guid: 437498ee76288534297bd80193e188a1,
         type: 3}
-      propertyPath: m_AnchorMax.y
-      value: 1
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 4416120186216355707, guid: 437498ee76288534297bd80193e188a1,
         type: 3}
-      propertyPath: m_Pivot.x
-      value: 0.5
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 4416120186216355707, guid: 437498ee76288534297bd80193e188a1,
         type: 3}
-      propertyPath: m_Pivot.y
+      propertyPath: m_LocalEulerAnglesHint.z
       value: 0
       objectReference: {fileID: 0}
     m_RemovedComponents: []
@@ -1058,108 +1105,108 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 4629208298242955682, guid: 2e62841493918ae48a4e4521740aa9dd,
         type: 3}
-      propertyPath: m_LocalPosition.x
-      value: 0
+      propertyPath: m_Pivot.x
+      value: 0.5
       objectReference: {fileID: 0}
     - target: {fileID: 4629208298242955682, guid: 2e62841493918ae48a4e4521740aa9dd,
         type: 3}
-      propertyPath: m_LocalPosition.y
-      value: 0
+      propertyPath: m_Pivot.y
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 4629208298242955682, guid: 2e62841493918ae48a4e4521740aa9dd,
         type: 3}
-      propertyPath: m_LocalPosition.z
-      value: 0
+      propertyPath: m_RootOrder
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 4629208298242955682, guid: 2e62841493918ae48a4e4521740aa9dd,
         type: 3}
-      propertyPath: m_LocalRotation.x
+      propertyPath: m_AnchorMax.x
       value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 4629208298242955682, guid: 2e62841493918ae48a4e4521740aa9dd,
         type: 3}
-      propertyPath: m_LocalRotation.y
-      value: 0
+      propertyPath: m_AnchorMax.y
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 4629208298242955682, guid: 2e62841493918ae48a4e4521740aa9dd,
         type: 3}
-      propertyPath: m_LocalRotation.z
+      propertyPath: m_AnchorMin.x
       value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 4629208298242955682, guid: 2e62841493918ae48a4e4521740aa9dd,
         type: 3}
-      propertyPath: m_LocalRotation.w
+      propertyPath: m_AnchorMin.y
       value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 4629208298242955682, guid: 2e62841493918ae48a4e4521740aa9dd,
         type: 3}
-      propertyPath: m_RootOrder
-      value: 1
+      propertyPath: m_SizeDelta.x
+      value: 200
       objectReference: {fileID: 0}
     - target: {fileID: 4629208298242955682, guid: 2e62841493918ae48a4e4521740aa9dd,
         type: 3}
-      propertyPath: m_LocalEulerAnglesHint.x
-      value: 0
+      propertyPath: m_SizeDelta.y
+      value: 40
       objectReference: {fileID: 0}
     - target: {fileID: 4629208298242955682, guid: 2e62841493918ae48a4e4521740aa9dd,
         type: 3}
-      propertyPath: m_LocalEulerAnglesHint.y
+      propertyPath: m_LocalPosition.x
       value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 4629208298242955682, guid: 2e62841493918ae48a4e4521740aa9dd,
         type: 3}
-      propertyPath: m_LocalEulerAnglesHint.z
+      propertyPath: m_LocalPosition.y
       value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 4629208298242955682, guid: 2e62841493918ae48a4e4521740aa9dd,
         type: 3}
-      propertyPath: m_AnchoredPosition.x
-      value: 145
+      propertyPath: m_LocalPosition.z
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 4629208298242955682, guid: 2e62841493918ae48a4e4521740aa9dd,
         type: 3}
-      propertyPath: m_AnchoredPosition.y
-      value: -30
+      propertyPath: m_LocalRotation.w
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 4629208298242955682, guid: 2e62841493918ae48a4e4521740aa9dd,
         type: 3}
-      propertyPath: m_SizeDelta.x
-      value: 200
+      propertyPath: m_LocalRotation.x
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 4629208298242955682, guid: 2e62841493918ae48a4e4521740aa9dd,
         type: 3}
-      propertyPath: m_SizeDelta.y
-      value: 40
+      propertyPath: m_LocalRotation.y
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 4629208298242955682, guid: 2e62841493918ae48a4e4521740aa9dd,
         type: 3}
-      propertyPath: m_AnchorMin.x
+      propertyPath: m_LocalRotation.z
       value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 4629208298242955682, guid: 2e62841493918ae48a4e4521740aa9dd,
         type: 3}
-      propertyPath: m_AnchorMin.y
-      value: 1
+      propertyPath: m_AnchoredPosition.x
+      value: 145
       objectReference: {fileID: 0}
     - target: {fileID: 4629208298242955682, guid: 2e62841493918ae48a4e4521740aa9dd,
         type: 3}
-      propertyPath: m_AnchorMax.x
-      value: 0
+      propertyPath: m_AnchoredPosition.y
+      value: -30
       objectReference: {fileID: 0}
     - target: {fileID: 4629208298242955682, guid: 2e62841493918ae48a4e4521740aa9dd,
         type: 3}
-      propertyPath: m_AnchorMax.y
-      value: 1
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 4629208298242955682, guid: 2e62841493918ae48a4e4521740aa9dd,
         type: 3}
-      propertyPath: m_Pivot.x
-      value: 0.5
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 4629208298242955682, guid: 2e62841493918ae48a4e4521740aa9dd,
         type: 3}
-      propertyPath: m_Pivot.y
-      value: 1
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
       objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 2e62841493918ae48a4e4521740aa9dd, type: 3}

+ 64 - 4
Assets/Lua/Config/WJRankRewardCfg.lua

@@ -1,9 +1,69 @@
-local WJRankRewordCfg = {
+local WJRankRewardCfg = {
 [1]={
-['id']=1,
+['Id']=1,
 ['Condition']={{1,1}},
-['Reward']={},
+['Reward']={{344,30000},{2,1000000},{48,3000}},
+['Day']=1,
+},
+[2]={
+['Id']=2,
+['Condition']={{2,2}},
+['Reward']={{344,25000},{2,900000},{48,2500}},
+['Day']=1,
+},
+[3]={
+['Id']=3,
+['Condition']={{3,3}},
+['Reward']={{344,20000},{2,800000},{48,2000}},
+['Day']=1,
+},
+[4]={
+['Id']=4,
+['Condition']={{4,4}},
+['Reward']={{344,15000},{2,700000},{48,1500}},
+['Day']=1,
+},
+[5]={
+['Id']=5,
+['Condition']={{5,5}},
+['Reward']={{344,10000},{2,600000},{48,1200}},
+['Day']=1,
+},
+[6]={
+['Id']=6,
+['Condition']={{6,10}},
+['Reward']={{344,8000},{2,500000},{48,1000}},
+['Day']=1,
+},
+[7]={
+['Id']=7,
+['Condition']={{11,20}},
+['Reward']={{344,7000},{2,400000},{48,900}},
+['Day']=1,
+},
+[8]={
+['Id']=8,
+['Condition']={{21,50}},
+['Reward']={{344,6000},{2,300000},{48,800}},
+['Day']=1,
+},
+[9]={
+['Id']=9,
+['Condition']={{51,100}},
+['Reward']={{344,5000},{2,200000},{48,700}},
+['Day']=1,
+},
+[10]={
+['Id']=10,
+['Condition']={{101,1000}},
+['Reward']={{344,3000},{2,1500000},{48,600}},
+['Day']=1,
+},
+[11]={
+['Id']=11,
+['Condition']={{1001,5000}},
+['Reward']={{344,2000},{2,100000},{48,500}},
 ['Day']=1,
 },
 }
-return WJRankRewordCfg
+return WJRankRewardCfg

+ 28 - 0
Assets/Lua/Logic/ClimbingTower/ClimbingTowerDataMgr.lua

@@ -660,6 +660,10 @@ function ClimbingTowerDataMgr:SetCurWjLevel(lv)
     self.wjLevel = lv
 end
 
+function ClimbingTowerDataMgr:GetCurDay()
+    return self.curDay
+end
+
 function ClimbingTowerDataMgr:GetWjRewordCfgByLv(lv)
     local cfgmgr = ManagerContainer.CfgMgr
     local cfg = nil
@@ -909,4 +913,28 @@ end
 function ClimbingTowerDataMgr:GetSelfRankData()
     return self.WjRankMgr.selfRank
 end
+
+function ClimbingTowerDataMgr:GetCurDayRankRewardCfg()
+    return ManagerContainer.CfgMgr:GetWjRankDayRewardCfgsByDay(self.curDay)
+end
+
+function ClimbingTowerDataMgr:GetWjRewardByRank(rank)
+    if rank == nil or rank == 0 then
+        return nil
+    end
+
+    local rankRewardCfg = self:GetCurDayRankRewardCfg()
+
+    for _, rankRewardItem in pairs(rankRewardCfg) do
+        local rankLimit = rankRewardItem.Condition[1]
+        --LogError(rank.."--------------------rankLimit-----"..Inspect(rankLimit))
+        if rank == rankLimit[1]  then
+            return rankRewardItem.Reward
+        elseif rank >= rankLimit[1]  and  rank <= rankLimit[2] then
+            return rankRewardItem.Reward         
+        end
+    end
+    return nil
+end
+
 return ClimbingTowerDataMgr

+ 1 - 1
Assets/Lua/Logic/ClimbingTower/TowerRankDataMgr.lua

@@ -69,7 +69,7 @@ end
 
 function TowerRankDataMgr:ReqTowerRankBriefData(uids)
     if uids == nil or #uids == 0 then
-        LogError('444444444')
+        --LogError('444444444')
         return
     end
     ManagerContainer.NetManager:SendMessage(ProtoMsgId.CS_GET_OTHER_PLAYER_BRIEF_INFO_REQ, {type=self.type, player_list=uids})

+ 48 - 0
Assets/Lua/UI/GridViewItem/ClimbingTowerRankItem_Generate.lua

@@ -1,3 +1,11 @@
+---@class ClimbingTowerRankItem__Generate_content
+---@field public gameObject UnityEngine.GameObject
+---@field public horizontalLayoutGroup UnityEngine.UI.HorizontalLayoutGroup
+
+---@class ClimbingTowerRankItem__Generate_rewordNode
+---@field public gameObject UnityEngine.GameObject
+---@field public loopHorizontalScrollRect UnityEngine.UI.LoopHorizontalScrollRect
+
 ---@class ClimbingTowerRankItem__Generate_serverName
 ---@field public gameObject UnityEngine.GameObject
 ---@field public text UnityEngine.UI.Text
@@ -62,6 +70,8 @@
 ---@field private blockNumTitle ClimbingTowerRankItem__Generate_blockNumTitle
 ---@field private blockNum ClimbingTowerRankItem__Generate_blockNum
 ---@field private serverName ClimbingTowerRankItem__Generate_serverName
+---@field private rewordNode ClimbingTowerRankItem__Generate_rewordNode
+---@field private content ClimbingTowerRankItem__Generate_content
 local ClimbingTowerRankItemView = class("ClimbingTowerRankItemView")
 
 function ClimbingTowerRankItemView:ctor()
@@ -91,6 +101,8 @@ function ClimbingTowerRankItemView:InitGenerate(Root, data)
 	self:InitGenerate__11(Root,data)
 	self:InitGenerate__12(Root,data)
 	self:InitGenerate__13(Root,data)
+	self:InitGenerate__14(Root,data)
+	self:InitGenerate__15(Root,data)
 
 
 end
@@ -273,6 +285,34 @@ function ClimbingTowerRankItemView:InitGenerate__13(Root, data)
 	tmp.text = tmp:GetComponent(Enum.TypeInfo.Text)
 end
 
+---@private
+function ClimbingTowerRankItemView:InitGenerate__14(Root, data)
+--[[
+	RewordNode
+--]]
+	local tmp = Root:Find("RewordNode").gameObject
+	if tolua.getpeer(tmp) == nil then
+		tolua.setpeer(tmp, {})
+	end
+	self.rewordNode = tmp
+
+	tmp.loopHorizontalScrollRect = tmp:GetComponent(Enum.TypeInfo.LoopHorizontalScrollRect)
+end
+
+---@private
+function ClimbingTowerRankItemView:InitGenerate__15(Root, data)
+--[[
+	RewordNode/Viewport/Content
+--]]
+	local tmp = Root:Find("RewordNode/Viewport/Content").gameObject
+	if tolua.getpeer(tmp) == nil then
+		tolua.setpeer(tmp, {})
+	end
+	self.content = tmp
+
+	tmp.horizontalLayoutGroup = tmp:GetComponent(Enum.TypeInfo.HorizontalLayoutGroup)
+end
+
 ---@private
 function ClimbingTowerRankItemView:GenerateDestroy()
 	if tolua.getpeer(self.serverName) ~= nil then
@@ -320,6 +360,14 @@ function ClimbingTowerRankItemView:GenerateDestroy()
 		tolua.setpeer(self.blockNumTitle, nil)
 	end
 	self.blockNumTitle = nil
+	if tolua.getpeer(self.rewordNode) ~= nil then
+		tolua.setpeer(self.rewordNode, nil)
+	end
+	self.rewordNode = nil
+	if tolua.getpeer(self.content) ~= nil then
+		tolua.setpeer(self.content, nil)
+	end
+	self.content = nil
 	self.transform = nil
 	self.gameObject = nil
 	self.inited = false

+ 7 - 1
Assets/Lua/UI/UIClimbingTower/UIClimbingTowerBattleView.lua

@@ -27,7 +27,7 @@ function UIClimbingTowerBattleView:FillContent(data, uiBase)
 end
 
 function UIClimbingTowerBattleView:Init()
-
+	local iswj = ManagerContainer.DataMgr.TowerDataMgr:IsWJMode()
 	if self.NewBattleChatPart == nil then
 		self.NewBattleChatPart = NewBattleChatPart:new()
 	end
@@ -60,6 +60,12 @@ function UIClimbingTowerBattleView:Init()
 		self.battleReplayPart:Hide()
 	end
 
+	if iswj then
+		self.boardTitle.uILocalizeScript:SetContent('wjTower')
+	else
+		self.boardTitle.uILocalizeScript:SetContent('TitleClimbingTower')
+	end
+
 	self.leftFightingTime = self.controller:FightingTime()
 	self.leftTime.text.text = FormatTimeMS(self.leftFightingTime)
 	self.leftFightingTimeHandler = ManagerContainer.LuaTimerMgr:AddTimer(1000, -1, self, self.OnShowLeftFightingTime, nil)

+ 28 - 1
Assets/Lua/UI/UIClimbingTower/UIClimbingTowerBattleView_Generate.lua

@@ -2,9 +2,15 @@
 ---@field public gameObject UnityEngine.GameObject
 ---@field public text UnityEngine.UI.Text
 
+---@class UIClimbingTowerBattle__Generate_boardTitle
+---@field public gameObject UnityEngine.GameObject
+---@field public uILocalizeScript UILocalizeScript
+---@field public text UnityEngine.UI.Text
+
 ---@class UIClimbingTowerBattle__Generate
 ---@field private gameObject UnityEngine.GameObject
 ---@field private transform UnityEngine.Transform
+---@field private boardTitle UIClimbingTowerBattle__Generate_boardTitle
 ---@field private leftTime UIClimbingTowerBattle__Generate_leftTime
 ---@field private infinite UnityEngine.GameObject
 local UIClimbingTowerBattleView = class("UIClimbingTowerBattleView", require("UIViewBase"))
@@ -28,12 +34,29 @@ function UIClimbingTowerBattleView:InitGenerate(Root, data)
 
 	self:InitGenerate__1(Root,data)
 	self:InitGenerate__2(Root,data)
+	self:InitGenerate__3(Root,data)
 
 
 end
 
 ---@private
 function UIClimbingTowerBattleView:InitGenerate__1(Root, data)
+--[[
+	TopView/UITitle/BoardTitle
+--]]
+	local tmp = Root:Find("TopView/UITitle/BoardTitle").gameObject
+	if tolua.getpeer(tmp) == nil then
+		tolua.setpeer(tmp, {})
+	end
+	self.boardTitle = tmp
+
+	tmp.uILocalizeScript = tmp:GetComponent(Enum.TypeInfo.UILocalizeScript)
+
+	tmp.text = tmp:GetComponent(Enum.TypeInfo.Text)
+end
+
+---@private
+function UIClimbingTowerBattleView:InitGenerate__2(Root, data)
 --[[
 	TopView/BattleTime/LeftBattleTime
 --]]
@@ -47,7 +70,7 @@ function UIClimbingTowerBattleView:InitGenerate__1(Root, data)
 end
 
 ---@private
-function UIClimbingTowerBattleView:InitGenerate__2(Root, data)
+function UIClimbingTowerBattleView:InitGenerate__3(Root, data)
 --[[
 	TopView/BattleTime/infinite
 --]]
@@ -60,6 +83,10 @@ end
 
 ---@private
 function UIClimbingTowerBattleView:GenerateDestroy()
+	if tolua.getpeer(self.boardTitle) ~= nil then
+		tolua.setpeer(self.boardTitle, nil)
+	end
+	self.boardTitle = nil
 	if tolua.getpeer(self.leftTime) ~= nil then
 		tolua.setpeer(self.leftTime, nil)
 	end

+ 6 - 1
Assets/Lua/UI/UIClimbingTower/UIClimbingTowerBattleWinCtr.lua

@@ -36,7 +36,12 @@ function UIClimbingTowerBattleWinCtr:BackPageId()
 end
 
 function UIClimbingTowerBattleWinCtr:EnterNextBattle()
-	TowerDataMgr:SendClimbingTowerBeginReq(TowerDataMgr:GetCurChallengeLevel())
+	if TowerDataMgr:IsWJMode() then
+		TowerDataMgr:SendWjBeginReq()
+	else
+		TowerDataMgr:SendClimbingTowerBeginReq(TowerDataMgr:GetCurChallengeLevel())
+	end
+	
 end
 
 function UIClimbingTowerBattleWinCtr:GetLevelRewards()

+ 24 - 0
Assets/Lua/UI/UIClimbingTower/UIClimbingTowerRankView.lua

@@ -262,6 +262,7 @@ function UIClimbingTowerRankView:RefreshClimibingTowerRankItem(rankItemLua,idx,r
 	if iswj then
 		rankItemLua.levelNum.text.text = tostring(rankData.wjLevel)
 		rankItemLua.passedTime.text.text = rankData.wjpassedTimeStr
+		self:RefReward(rankItemLua,rankData)
 	else
 		rankItemLua.levelNum.text.text = tostring(rankData.leveLNum)
 		rankItemLua.passedTime.text.text = rankData.passedTimeStr
@@ -360,5 +361,28 @@ function UIClimbingTowerRankView:IsWj()
 	return TowerDataMgr:IsWJMode() 
 end
 
+
+function UIClimbingTowerRankView:RefReward(itemLua,rankData)
+	--rankData.rank
+    local reward = TowerDataMgr:GetWjRewardByRank(rankData.rank)
+    if reward then
+        local rewardList = ManagerContainer.DataMgr.HardMissionDataMgr:GetReward(reward)
+        -- LogError("rewardList = "..Inspect(rewardList))
+        -- LogError("reward = "..Inspect(reward))
+        itemLua.rewordNode.loopHorizontalScrollRect:ClearCells()
+        CommonUtil.LoopGridViewEleCreateNew(self, itemLua.rewordNode.loopHorizontalScrollRect,
+            itemLua.content.horizontalLayoutGroup, rewardList, 0, self, self.UpdateRewards, nil, nil, 0);
+    end
+
+end
+
+function UIClimbingTowerRankView:UpdateRewards(_itemLua, _idx, _data)
+    if not _itemLua or not _data then
+        return
+    end
+    CommonUtil.UpdateItemPrefab(self, _itemLua, _data, Enum.ItemIEnterType.Bag)
+end
+
+
 return UIClimbingTowerRankView
 

+ 1 - 1
Assets/Lua/UI/UIClimbingTower/UIClimbingTowerView.lua

@@ -907,7 +907,7 @@ end
 function UIClimbingTowerView:RefTowerModeBtn(cmode)
 	local curMode = cmode
 
-	local AllMode = {0,1} ---0 c  1 P  2 W
+	local AllMode = {0,1,2} ---0 c  1 P  2 W
 
 	-- local emUnlockLevel = GlobalConfig.Instance:GetConfigIntValue(365)
 	-- local curLevel = ManagerContainer.LuaBattleMgr:GetCurDiffLvID()

+ 2 - 1
Assets/Lua/UI/UIClimbingTower/UIWJTowerRewardInfoView.lua

@@ -57,7 +57,8 @@ function UIWJTowerRewardInfoView:OnClickClose()
 end
 
 function UIWJTowerRewardInfoView:RefInfo()
-	local cfgs = ManagerContainer.CfgMgr:GetWjDayRewardCfgsByDay(1)
+	local curday = ManagerContainer.DataMgr.TowerDataMgr:GetCurDay()
+	local cfgs = ManagerContainer.CfgMgr:GetWjDayRewardCfgsByDay(curday)
 	self.rewardScroll.loopVerticalScrollRect:ClearCells()
 	CommonUtil.LoopGridViewEleCreateNew(self,
 	self.rewardScroll.loopVerticalScrollRect,