Parcourir la source

WildAttack显示补充

lvjincheng il y a 2 ans
Parent
commit
82b4f65e83

+ 2 - 0
Assets/BowArrow/Scripts/Manager/LoginMgr/LoginMgr.cs

@@ -75,6 +75,8 @@ public class UserInfo
     //闯关记录(gameType:通关数)(野兔、野鸡、野狼的通关数)
     public Dictionary<int, int> challengeLevels = new Dictionary<int, int>();
     public string guideRecord = "";
+    //wildAttackRecord最高分纪录
+    public int wildAttackRecord;
     public void Save()
     {
         try { UserComp.Instance.saveUserInfo(this); } catch (System.Exception e) { Debug.LogError(e.Message); }

+ 1 - 0
Assets/StreamingAssets/strings.csv

@@ -11,3 +11,4 @@ restart,再来一局?,DEFENSE AGAIN?
 monster,独角怪,UNIMON
 back,不玩了!,CRY & LEAVE
 highScore,最高分,TOP SCORE
+resetAim,视角归位,Reset Aim

+ 30 - 13
Assets/WildAttack/Resources/UI/GameOverPanel.prefab

@@ -29,6 +29,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: 1814882479272626091}
   m_Father: {fileID: 9105039727498893410}
@@ -36,9 +37,9 @@ RectTransform:
   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: -33.085, y: -41.512}
+  m_AnchoredPosition: {x: 93, y: -41.512}
   m_SizeDelta: {x: 250.894, y: 71.955}
-  m_Pivot: {x: 0.5, y: 0.5}
+  m_Pivot: {x: 1, y: 0.5}
 --- !u!222 &1814882478158383978
 CanvasRenderer:
   m_ObjectHideFlags: 0
@@ -74,10 +75,10 @@ MonoBehaviour:
     m_BestFit: 0
     m_MinSize: 2
     m_MaxSize: 50
-    m_Alignment: 3
+    m_Alignment: 5
     m_AlignByGeometry: 0
     m_RichText: 1
-    m_HorizontalOverflow: 0
+    m_HorizontalOverflow: 1
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: "\u672C\u5C40\u79EF\u5206\uFF1A"
@@ -124,6 +125,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: 1814882479128304508}
   m_RootOrder: 1
@@ -199,6 +201,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: 1814882479128304508}
   m_RootOrder: 2
@@ -274,6 +277,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: 1814882479612267792}
   - {fileID: 1814882478644998007}
@@ -354,13 +358,14 @@ 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: 9105039726873865194}
   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: 166.0499, y: 1.4685}
+  m_AnchoredPosition: {x: 171, y: 1.4685}
   m_SizeDelta: {x: 124.9249, y: 61.538}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &1814882479197124726
@@ -401,7 +406,7 @@ MonoBehaviour:
     m_Alignment: 3
     m_AlignByGeometry: 0
     m_RichText: 1
-    m_HorizontalOverflow: 0
+    m_HorizontalOverflow: 1
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: 9999
@@ -449,6 +454,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: 1814882478158383983}
   m_RootOrder: 0
@@ -496,7 +502,7 @@ MonoBehaviour:
     m_Alignment: 3
     m_AlignByGeometry: 0
     m_RichText: 1
-    m_HorizontalOverflow: 0
+    m_HorizontalOverflow: 1
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: 6666
@@ -543,6 +549,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: 1814882479128304508}
   m_RootOrder: 0
@@ -618,6 +625,7 @@ RectTransform:
   m_LocalRotation: {x: 0, y: 1, z: 0, w: 0}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 1814882479128304508}
   m_RootOrder: 3
@@ -693,6 +701,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: 9105039727498893410}
   m_RootOrder: 7
@@ -768,6 +777,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: 9105039727498893410}
   m_RootOrder: 0
@@ -841,6 +851,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: 9105039727498893410}
   m_RootOrder: 2
@@ -879,6 +890,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: 1814882479197124724}
   m_Father: {fileID: 9105039727498893410}
@@ -886,9 +898,9 @@ RectTransform:
   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: -29.933, y: 46.624}
+  m_AnchoredPosition: {x: 93, y: 46.624}
   m_SizeDelta: {x: 257.197, y: 58.601}
-  m_Pivot: {x: 0.5, y: 0.5}
+  m_Pivot: {x: 1, y: 0.5}
 --- !u!222 &9105039726873865192
 CanvasRenderer:
   m_ObjectHideFlags: 0
@@ -924,10 +936,10 @@ MonoBehaviour:
     m_BestFit: 0
     m_MinSize: 2
     m_MaxSize: 50
-    m_Alignment: 3
+    m_Alignment: 5
     m_AlignByGeometry: 0
     m_RichText: 1
-    m_HorizontalOverflow: 0
+    m_HorizontalOverflow: 1
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: "\u6700\u9AD8\u79EF\u5206\uFF1A"
@@ -975,6 +987,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: 9105039727916817168}
   m_Father: {fileID: 9105039727498893410}
@@ -1095,6 +1108,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: 2243261248130194198}
   - {fileID: 1814882479128304508}
@@ -1171,6 +1185,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: 9105039727069009154}
   m_RootOrder: 0
@@ -1212,7 +1227,7 @@ MonoBehaviour:
     m_Font: {fileID: 12800000, guid: ebd72fbd3d0c52e4a8e62cb26e73bb2c, type: 3}
     m_FontSize: 46
     m_FontStyle: 0
-    m_BestFit: 0
+    m_BestFit: 1
     m_MinSize: 0
     m_MaxSize: 46
     m_Alignment: 4
@@ -1266,6 +1281,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: 9105039728299111540}
   m_Father: {fileID: 9105039727498893410}
@@ -1387,6 +1403,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: 9105039727986169544}
   m_RootOrder: 0
@@ -1428,7 +1445,7 @@ MonoBehaviour:
     m_Font: {fileID: 12800000, guid: ebd72fbd3d0c52e4a8e62cb26e73bb2c, type: 3}
     m_FontSize: 46
     m_FontStyle: 0
-    m_BestFit: 0
+    m_BestFit: 1
     m_MinSize: 3
     m_MaxSize: 46
     m_Alignment: 4

+ 306 - 73
Assets/WildAttack/Resources/UI/MainPanel.prefab

@@ -1,6 +1,6 @@
 %YAML 1.1
 %TAG !u! tag:unity3d.com,2011:
---- !u!1 &4989878517940502022
+--- !u!1 &430956640598996585
 GameObject:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -8,86 +8,162 @@ GameObject:
   m_PrefabAsset: {fileID: 0}
   serializedVersion: 6
   m_Component:
-  - component: {fileID: 4989878517940502021}
-  - component: {fileID: 4989878517940502075}
-  - component: {fileID: 4989878517940502020}
-  - component: {fileID: 4989878517940502074}
+  - component: {fileID: 1996560620015308219}
+  - component: {fileID: 2138057753399056656}
+  - component: {fileID: 6247512517917767408}
   m_Layer: 5
-  m_Name: Text
+  m_Name: Avatar
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
---- !u!224 &4989878517940502021
+--- !u!224 &1996560620015308219
 RectTransform:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 4989878517940502022}
+  m_GameObject: {fileID: 430956640598996585}
   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: 6012519490228947876}
+  m_Father: {fileID: 5108420819445183406}
   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: 45.221, y: -0.0000024173}
-  m_SizeDelta: {x: 34.314, y: 28.97}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &4989878517940502075
+--- !u!222 &2138057753399056656
 CanvasRenderer:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 4989878517940502022}
+  m_GameObject: {fileID: 430956640598996585}
   m_CullTransparentMesh: 1
---- !u!114 &4989878517940502020
+--- !u!114 &6247512517917767408
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 4989878517940502022}
+  m_GameObject: {fileID: 430956640598996585}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0.3882353, g: 1, b: 0.2784314, a: 1}
+  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: 0}
+  m_Type: 0
+  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!1 &3073094097587348135
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 124318218313889465}
+  - component: {fileID: 5585289208157041660}
+  - component: {fileID: 1776296238283755799}
+  - component: {fileID: 2372145591268020266}
+  m_Layer: 5
+  m_Name: TextHighScoreValue
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &124318218313889465
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3073094097587348135}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1.5, y: 1.5, z: 1.5}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 4989878519305391303}
+  m_RootOrder: 2
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 33.528}
+  m_Pivot: {x: 0, y: 0.5}
+--- !u!222 &5585289208157041660
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3073094097587348135}
+  m_CullTransparentMesh: 1
+--- !u!114 &1776296238283755799
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3073094097587348135}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0.96862745, g: 0.9372549, b: 0.54901963, 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_FontData:
-    m_Font: {fileID: 12800000, guid: ebd72fbd3d0c52e4a8e62cb26e73bb2c, type: 3}
-    m_FontSize: 20
+    m_Font: {fileID: 12800000, guid: 5d8cce9d05f408246b743f58c6f6ffd3, type: 3}
+    m_FontSize: 22
     m_FontStyle: 0
     m_BestFit: 0
-    m_MinSize: 2
+    m_MinSize: 0
     m_MaxSize: 40
-    m_Alignment: 3
+    m_Alignment: 4
     m_AlignByGeometry: 0
     m_RichText: 1
     m_HorizontalOverflow: 0
     m_VerticalOverflow: 0
     m_LineSpacing: 1
-  m_Text: 1/8
---- !u!114 &4989878517940502074
+  m_Text: 6666
+--- !u!114 &2372145591268020266
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 4989878517940502022}
+  m_GameObject: {fileID: 3073094097587348135}
   m_Enabled: 1
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: e19747de3f5aca642ab2be37e372fb86, type: 3}
@@ -96,7 +172,7 @@ MonoBehaviour:
   m_EffectColor: {r: 0, g: 0, b: 0, a: 1}
   m_EffectDistance: {x: 2, y: -2}
   m_UseGraphicAlpha: 1
---- !u!1 &4989878518442001370
+--- !u!1 &3915393438978726778
 GameObject:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -104,51 +180,53 @@ GameObject:
   m_PrefabAsset: {fileID: 0}
   serializedVersion: 6
   m_Component:
-  - component: {fileID: 4989878518442001369}
-  - component: {fileID: 4989878518442001375}
-  - component: {fileID: 4989878518442001368}
+  - component: {fileID: 5108420819445183406}
+  - component: {fileID: 8557950394647970851}
+  - component: {fileID: 6836855507074472877}
+  - component: {fileID: 3343402097332807309}
   m_Layer: 5
-  m_Name: ImgHead
+  m_Name: Mask
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 0
---- !u!224 &4989878518442001369
+  m_IsActive: 1
+--- !u!224 &5108420819445183406
 RectTransform:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 4989878518442001370}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_GameObject: {fileID: 3915393438978726778}
+  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: 1.5, y: 1.5, z: 1.5}
   m_ConstrainProportionsScale: 0
-  m_Children: []
+  m_Children:
+  - {fileID: 1996560620015308219}
   m_Father: {fileID: 6012519489348195314}
   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.5375, y: -0.7736}
-  m_SizeDelta: {x: 45.1715, y: 43.9827}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: -32, y: -32}
   m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &4989878518442001375
+--- !u!222 &8557950394647970851
 CanvasRenderer:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 4989878518442001370}
+  m_GameObject: {fileID: 3915393438978726778}
   m_CullTransparentMesh: 1
---- !u!114 &4989878518442001368
+--- !u!114 &6836855507074472877
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 4989878518442001370}
+  m_GameObject: {fileID: 3915393438978726778}
   m_Enabled: 1
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
@@ -156,13 +234,13 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
   m_Color: {r: 1, g: 1, b: 1, a: 1}
-  m_RaycastTarget: 1
+  m_RaycastTarget: 0
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: d5c97e10e54962544b42865581468079, type: 3}
+  m_Sprite: {fileID: 21300000, guid: ef2edea59828bb143909f06c946097c7, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -172,6 +250,115 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
+--- !u!114 &3343402097332807309
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3915393438978726778}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 31a19414c41e5ae4aae2af33fee712f6, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_ShowMaskGraphic: 1
+--- !u!1 &4989878517940502022
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 4989878517940502021}
+  - component: {fileID: 4989878517940502075}
+  - component: {fileID: 4989878517940502020}
+  - component: {fileID: 4989878517940502074}
+  m_Layer: 5
+  m_Name: Text
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &4989878517940502021
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4989878517940502022}
+  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: 6012519490228947876}
+  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: 45.221, y: -0.0000024173}
+  m_SizeDelta: {x: 34.314, y: 28.97}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &4989878517940502075
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4989878517940502022}
+  m_CullTransparentMesh: 1
+--- !u!114 &4989878517940502020
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4989878517940502022}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0.3882353, g: 1, b: 0.2784314, 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_FontData:
+    m_Font: {fileID: 12800000, guid: ebd72fbd3d0c52e4a8e62cb26e73bb2c, type: 3}
+    m_FontSize: 20
+    m_FontStyle: 0
+    m_BestFit: 0
+    m_MinSize: 2
+    m_MaxSize: 40
+    m_Alignment: 3
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: 1/8
+--- !u!114 &4989878517940502074
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4989878517940502022}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: e19747de3f5aca642ab2be37e372fb86, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_EffectColor: {r: 0, g: 0, b: 0, a: 1}
+  m_EffectDistance: {x: 2, y: -2}
+  m_UseGraphicAlpha: 1
 --- !u!1 &4989878518585913223
 GameObject:
   m_ObjectHideFlags: 0
@@ -201,8 +388,6 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 4989878519305391303}
-  - {fileID: 6012519488631260024}
-  - {fileID: 6012519489082394241}
   m_Father: {fileID: 6012519488922156835}
   m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -343,6 +528,8 @@ GameObject:
   - component: {fileID: 4989878519305391303}
   - component: {fileID: 4989878519305391301}
   - component: {fileID: 4989878519305391302}
+  - component: {fileID: 2240180738457483905}
+  - component: {fileID: 6950046506248144863}
   m_Layer: 5
   m_Name: bg
   m_TagString: Untagged
@@ -361,15 +548,18 @@ RectTransform:
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
-  m_Children: []
+  m_Children:
+  - {fileID: 6012519488631260024}
+  - {fileID: 6012519489082394241}
+  - {fileID: 124318218313889465}
   m_Father: {fileID: 4989878518585913222}
   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: 80.015, y: -44.644}
-  m_SizeDelta: {x: 371.694, y: 52.187}
-  m_Pivot: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: -95, y: -44.644}
+  m_SizeDelta: {x: 0, y: 52.187}
+  m_Pivot: {x: 0, y: 0.5}
 --- !u!222 &4989878519305391301
 CanvasRenderer:
   m_ObjectHideFlags: 0
@@ -408,6 +598,46 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
+--- !u!114 &2240180738457483905
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4989878519305391296}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 30649d3a9faa99c48a7b1166b86bf2a0, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Padding:
+    m_Left: 20
+    m_Right: 30
+    m_Top: 0
+    m_Bottom: 0
+  m_ChildAlignment: 4
+  m_Spacing: 0
+  m_ChildForceExpandWidth: 1
+  m_ChildForceExpandHeight: 1
+  m_ChildControlWidth: 1
+  m_ChildControlHeight: 0
+  m_ChildScaleWidth: 1
+  m_ChildScaleHeight: 0
+  m_ReverseArrangement: 0
+--- !u!114 &6950046506248144863
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4989878519305391296}
+  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 &5410056360022089356
 GameObject:
   m_ObjectHideFlags: 0
@@ -835,14 +1065,14 @@ RectTransform:
   m_LocalScale: {x: 1.5, y: 1.5, z: 1.5}
   m_ConstrainProportionsScale: 0
   m_Children: []
-  m_Father: {fileID: 4989878518585913222}
-  m_RootOrder: 1
+  m_Father: {fileID: 4989878519305391303}
+  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: -15.517, y: -44.503}
-  m_SizeDelta: {x: 98.969, y: 31.246}
-  m_Pivot: {x: 0.5, y: 0.5}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 31.246}
+  m_Pivot: {x: 0, y: 0.5}
 --- !u!222 &6012519488631260026
 CanvasRenderer:
   m_ObjectHideFlags: 0
@@ -884,7 +1114,7 @@ MonoBehaviour:
     m_HorizontalOverflow: 0
     m_VerticalOverflow: 0
     m_LineSpacing: 1
-  m_Text: "\u73A9\u5BB6\u540D\u5B57"
+  m_Text: "\u73A9\u5BB6\u540D\u79F0"
 --- !u!114 &6012519488631260028
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -1658,6 +1888,9 @@ MonoBehaviour:
   _textHighScore: {fileID: 6012519489082394242}
   _textHpBarTitle: {fileID: 0}
   _btnQuit: {fileID: 4989878519124238379}
+  _imgUserAvatar: {fileID: 6247512517917767408}
+  _textUserNickname: {fileID: 6012519488631260025}
+  _textUserRecordScore: {fileID: 1776296238283755799}
 --- !u!1 &6012519488925208801
 GameObject:
   m_ObjectHideFlags: 0
@@ -1991,7 +2224,7 @@ GameObject:
   - component: {fileID: 6012519489082394242}
   - component: {fileID: 6012519489082394302}
   m_Layer: 5
-  m_Name: TextHighScore
+  m_Name: TextHighScoreLabel
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -2009,14 +2242,14 @@ RectTransform:
   m_LocalScale: {x: 1.5, y: 1.5, z: 1.5}
   m_ConstrainProportionsScale: 0
   m_Children: []
-  m_Father: {fileID: 4989878518585913222}
-  m_RootOrder: 2
+  m_Father: {fileID: 4989878519305391303}
+  m_RootOrder: 1
   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: 162.17, y: -45.644}
-  m_SizeDelta: {x: 127.5614, y: 33.528}
-  m_Pivot: {x: 0.5, y: 0.5}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 33.528}
+  m_Pivot: {x: 0, y: 0.5}
 --- !u!222 &6012519489082394243
 CanvasRenderer:
   m_ObjectHideFlags: 0
@@ -2052,13 +2285,13 @@ MonoBehaviour:
     m_BestFit: 0
     m_MinSize: 0
     m_MaxSize: 40
-    m_Alignment: 3
+    m_Alignment: 4
     m_AlignByGeometry: 0
     m_RichText: 1
     m_HorizontalOverflow: 0
     m_VerticalOverflow: 0
     m_LineSpacing: 1
-  m_Text: "\u6700\u9AD8\u5206:6666"
+  m_Text: "\u6700\u9AD8\u5206:"
 --- !u!114 &6012519489082394302
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -2953,7 +3186,7 @@ RectTransform:
   m_LocalScale: {x: 1.5, y: 1.5, z: 1.5}
   m_ConstrainProportionsScale: 0
   m_Children:
-  - {fileID: 4989878518442001369}
+  - {fileID: 5108420819445183406}
   m_Father: {fileID: 6012519488922156835}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -4030,7 +4263,7 @@ MonoBehaviour:
     m_Alignment: 4
     m_AlignByGeometry: 0
     m_RichText: 1
-    m_HorizontalOverflow: 0
+    m_HorizontalOverflow: 1
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: "\u89C6\u89D2\u5F52\u4F4D"

+ 2 - 0
Assets/WildAttack/Scripts/Manager/GameMananger.cs

@@ -76,6 +76,8 @@ namespace WildAttack
             bow = GameObject.Find("Bow").GetComponent<Bow>();
 
             languageType = LanguageType.CH;
+            if (TextAutoLanguage2.GetLanguage() == LanguageEnum.English) languageType = LanguageType.EN;
+
             CrossHairTrans = GameObject.Find("CrossHairTrans").transform;
             originalBowRotation = CrossHairTrans.eulerAngles;
             wallAnim = GameObject.Find("Wall").GetComponent<Animator>();

+ 1 - 0
Assets/WildAttack/Scripts/Manager/UIManager.cs

@@ -96,6 +96,7 @@ namespace WildAttack
         public void Restart()
         {
             mainPanel.gameObject.SetActive(true);
+            mainPanel.GetComponent<MainPanel>().RenderUserInfo();
             hpBarPanel.gameObject.SetActive(true);
             gameOverPanel.gameObject.SetActive(false);
             crossHair.gameObject.SetActive(false);

+ 10 - 2
Assets/WildAttack/Scripts/UI/GameOverPanel.cs

@@ -94,10 +94,18 @@ namespace WildAttack
             text_back.text = StringModule.GetInstance().GetData("back");
             //text_process.text = $"{StringModule.GetInstance().GetData("wave")}:{(ProcessManager.GetInstance().CurrLevel > ProcessModule.GetInstance().processDataDic.Count ? ProcessModule.GetInstance().processDataDic.Count : ProcessManager.GetInstance().CurrLevel)} / {ProcessModule.GetInstance().processDataDic.Count}";
             //text_score.text = $"{StringModule.GetInstance().GetData("score")}:{GameMananger.GetInstance().TotalScore}"; 
-            text_highScoreTitle.text = StringModule.GetInstance().GetData("highScore") + ":";
-            text_highScore.text = "999";
+            
             text_currScoreTitle.text = StringModule.GetInstance().GetData("score") + ":";
             text_currScore.text = GameMananger.GetInstance().TotalScore.ToString();
+
+            if (GameMananger.GetInstance().TotalScore > LoginMgr.myUserInfo.wildAttackRecord)
+            {
+                LoginMgr.myUserInfo.wildAttackRecord = GameMananger.GetInstance().TotalScore;
+                LoginMgr.myUserInfo.Save();
+            }
+            text_highScoreTitle.text = StringModule.GetInstance().GetData("highScore") + ":";
+            text_highScore.text = LoginMgr.myUserInfo.wildAttackRecord.ToString();
+
         }
         #endregion
     }

+ 20 - 0
Assets/WildAttack/Scripts/UI/MainPanel.cs

@@ -41,6 +41,11 @@ namespace WildAttack
         [SerializeField] Text _textHighScore;
         [SerializeField] Text _textHpBarTitle;
         [SerializeField] Button _btnQuit;
+
+        //用户信息
+        [SerializeField] Image _imgUserAvatar;
+        [SerializeField] Text _textUserNickname;
+        [SerializeField] Text _textUserRecordScore;
         #endregion
 
         #region Lifecycle
@@ -57,7 +62,22 @@ namespace WildAttack
             var wallScreenPos = Camera.main.WorldToScreenPoint(wall.position);
 
             RegistEvent();
+
+            _btnResetAim.GetComponentInChildren<Text>().text = StringModule.GetInstance().GetData("resetAim");
+
+            RenderUserInfo();
         }
+
+        public void RenderUserInfo()
+        {
+            RoleMgr.SetAvatarToImage(
+                _imgUserAvatar,
+                LoginMgr.myUserInfo.avatarID, LoginMgr.myUserInfo.avatarUrl
+            );
+            _textUserNickname.text = LoginMgr.myUserInfo.nickname + "  ";
+            _textUserRecordScore.text = LoginMgr.myUserInfo.wildAttackRecord.ToString();
+        }
+
         // Update is called once per frame
         //void Update()
         //{