Merge branch 'master' of http://192.168.123.2:3000/ck/XiuXianGame

Assets/Res/UI/BoxPanel/BoxPanel.prefab

@@ -39,7 +39,7 @@ RectTransform:
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchoredPosition: {x: -3563, y: -182}
-  m_SizeDelta: {x: 1200, y: 2670}
+  m_SizeDelta: {x: 750, y: 1624}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &8965272612517638377
 MonoBehaviour:
@@ -354,7 +354,6 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: x4500
-  isNotAlaterFont: 0
 --- !u!114 &1113971702653909910
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -389,7 +388,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &8273459722014086988
 RectTransform:
   m_ObjectHideFlags: 0
@@ -500,6 +499,11 @@ MonoBehaviour:
     packgJsonPath: /Art/UIAssets/TextrueJson/all.txt
     packgSpritePath: Assets/Res/UIAtlas/all.spriteatlasv2
     lasetJsonGUID: fdc09952e21a713f23682168cce500b3
+  imageH: 50
+  useGradient: 0
+  topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
+  bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
+  direction: 0
 --- !u!1 &1730469624835137912
 GameObject:
   m_ObjectHideFlags: 0
@@ -576,90 +580,6 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
---- !u!1 &1901584059914874739
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 7
-  m_Component:
-  - component: {fileID: 671376058743289274}
-  - component: {fileID: 6970032159206589122}
-  - component: {fileID: 8745496088663452512}
-  m_Layer: 5
-  m_HasEditorInfo: 1
-  m_Name: close_x
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!224 &671376058743289274
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1901584059914874739}
-  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: 5225214374428017297}
-  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: 55, y: 55}
-  m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &6970032159206589122
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1901584059914874739}
-  m_CullTransparentMesh: 1
---- !u!114 &8745496088663452512
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1901584059914874739}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 3c247620ca3a1fd4ab2a2f3a5b287e07, 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: 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
-  _icon_name: dec_Close02
-  isNotLoadDeftIcon: 0
-  CurrSpriteAtlas: {fileID: 100100200, guid: 7b02f32fa59cd4e3085208946b112537, type: 3}
-  packInfo:
-    packName: all
-    packgJsonPath: /Art/UIAssets/TextrueJson/all.txt
-    packgSpritePath: Assets/Res/UIAtlas/all.spriteatlasv2
-    lasetJsonGUID: e8ac4a11df23a3327a9a6fed106efb0a
 --- !u!1 &2067541211709764960
 GameObject:
   m_ObjectHideFlags: 0
@@ -742,7 +662,6 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: "\u514D\u8D39\u5341\u8FDE\u62BD"
-  isNotAlaterFont: 0
 --- !u!114 &8091862720034378279
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -839,7 +758,7 @@ MonoBehaviour:
       m_Calls: []
   m_Sprite: {fileID: 0}
   m_Type: 0
-  m_PreserveAspect: 0
+  m_PreserveAspect: 1
   m_FillCenter: 1
   m_FillMethod: 4
   m_FillAmount: 1
@@ -849,12 +768,17 @@ MonoBehaviour:
   m_PixelsPerUnitMultiplier: 1
   _icon_name: icon_Coin
   isNotLoadDeftIcon: 0
-  CurrSpriteAtlas: {fileID: 100100200, guid: 3855e71da36cb4dfeb0ce0972ed08272, type: 3}
+  CurrSpriteAtlas: {fileID: 100100200, guid: 77f77eea85838ad4b8734050364b4892, type: 3}
   packInfo:
-    packName: allIcon
-    packgJsonPath: /Art/UIAssets/TextrueJson/allIcon.txt
-    packgSpritePath: Assets/Res/UIAtlas/allIcon.spriteatlasv2
-    lasetJsonGUID: 90086c527c943e1bb67739406e95cd52
+    packName: daoju
+    packgJsonPath: /Art/UIAssets/TextrueJson\daoju.txt
+    packgSpritePath: Assets/Res/UIAtlas/daoju.spriteatlasv2
+    lasetJsonGUID: 6e42cc1f96a3da679f0602631c62812a
+  imageH: 45
+  useGradient: 0
+  topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
+  bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
+  direction: 0
 --- !u!1 &2480383054228350462
 GameObject:
   m_ObjectHideFlags: 0
@@ -868,7 +792,6 @@ GameObject:
   - component: {fileID: 1395504526245340398}
   - component: {fileID: 7498556988576361376}
   - component: {fileID: 4062822801457872003}
-  - component: {fileID: 7623264381688979618}
   m_Layer: 5
   m_HasEditorInfo: 1
   m_Name: Text (Legacy)
@@ -938,7 +861,6 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: "\u5927\u81EA\u7136\u7684\u6069\u60E0.\u5B9D\u7BB1"
-  isNotAlaterFont: 0
 --- !u!114 &7498556988576361376
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -969,19 +891,6 @@ MonoBehaviour:
   m_EffectColor: {r: 0, g: 0, b: 0, a: 0.5}
   m_EffectDistance: {x: 3.03, y: -2.77}
   m_UseGraphicAlpha: 1
---- !u!114 &7623264381688979618
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2480383054228350462}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: d272e2a31d4cd8c408dc4d1c8963f314, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  id: 112
 --- !u!1 &2972985852202581853
 GameObject:
   m_ObjectHideFlags: 0
@@ -994,7 +903,6 @@ GameObject:
   - component: {fileID: 8313633874709827031}
   - component: {fileID: 7002168581208769732}
   - component: {fileID: 3505250749968322634}
-  - component: {fileID: 2944033596006560952}
   m_Layer: 5
   m_HasEditorInfo: 1
   m_Name: message
@@ -1065,7 +973,6 @@ MonoBehaviour:
     m_LineSpacing: 1
   m_Text: "\u6D88\u8017\u5BF9\u5E94\u7684\u91D1\u5E01\u5F00\u542F\u5B9D\u7BB1\uFF0C\u83B7\u5F97\u5927\u81EA\u7136\u7684\u6069\u60E0\uFF0C\u6709\u6982\u7387\u80FD\u83B7\u5F97\u4EE5\u4E0B\u7269\u54C1\uFF08\u82F1\u96C4\u8FDB\u9636\u6750\u6599\u3001
     \u5404\u79CD\u54C1\u8D28\u7684\u6B66\u5668\uFF09"
-  isNotAlaterFont: 0
 --- !u!114 &3505250749968322634
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -1081,19 +988,6 @@ MonoBehaviour:
   m_EffectColor: {r: 0, g: 0, b: 0, a: 0.5}
   m_EffectDistance: {x: 1, y: -1}
   m_UseGraphicAlpha: 1
---- !u!114 &2944033596006560952
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2972985852202581853}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: d272e2a31d4cd8c408dc4d1c8963f314, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  id: 113
 --- !u!1 &3049841431087626111
 GameObject:
   m_ObjectHideFlags: 0
@@ -1106,7 +1000,6 @@ GameObject:
   - component: {fileID: 9053714641588917627}
   - component: {fileID: 3611280464513745312}
   - component: {fileID: 2368691721423848255}
-  - component: {fileID: 139356596163324787}
   m_Layer: 5
   m_HasEditorInfo: 1
   m_Name: tt (1)
@@ -1176,7 +1069,6 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: "10\u6B21"
-  isNotAlaterFont: 0
 --- !u!114 &2368691721423848255
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -1192,19 +1084,6 @@ MonoBehaviour:
   m_EffectColor: {r: 0, g: 0, b: 0, a: 1}
   m_EffectDistance: {x: 1, y: -1}
   m_UseGraphicAlpha: 1
---- !u!114 &139356596163324787
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3049841431087626111}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: d272e2a31d4cd8c408dc4d1c8963f314, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  id: 1045
 --- !u!1 &3194501373201481477
 GameObject:
   m_ObjectHideFlags: 0
@@ -1344,7 +1223,6 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: x500
-  isNotAlaterFont: 0
 --- !u!114 &6487927115587773727
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -1371,7 +1249,6 @@ GameObject:
   - component: {fileID: 2683536534778087535}
   - component: {fileID: 3403599604496558754}
   - component: {fileID: 7811836410668786241}
-  - component: {fileID: 789590480390429455}
   m_Layer: 5
   m_HasEditorInfo: 1
   m_Name: message (1)
@@ -1441,20 +1318,6 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: "\u53CB\u60C5\u63D0\u793A10\u8FDE\u62BD\u66F4\u5212\u7B97"
-  isNotAlaterFont: 0
---- !u!114 &789590480390429455
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 5492516986451035646}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: d272e2a31d4cd8c408dc4d1c8963f314, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  id: 114
 --- !u!1 &5523729796495235583
 GameObject:
   m_ObjectHideFlags: 0
@@ -1467,7 +1330,6 @@ GameObject:
   - component: {fileID: 70910345278346324}
   - component: {fileID: 495549792939547536}
   - component: {fileID: 2300996724624505353}
-  - component: {fileID: 5030293210097237723}
   m_Layer: 5
   m_HasEditorInfo: 1
   m_Name: tt
@@ -1537,7 +1399,6 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: "1\u6B21"
-  isNotAlaterFont: 0
 --- !u!114 &2300996724624505353
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -1553,19 +1414,6 @@ MonoBehaviour:
   m_EffectColor: {r: 0, g: 0, b: 0, a: 1}
   m_EffectDistance: {x: 1, y: -1}
   m_UseGraphicAlpha: 1
---- !u!114 &5030293210097237723
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 5523729796495235583}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: d272e2a31d4cd8c408dc4d1c8963f314, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  id: 1044
 --- !u!1 &5948516582202927321
 GameObject:
   m_ObjectHideFlags: 0
@@ -1650,6 +1498,11 @@ MonoBehaviour:
     packgJsonPath: /Art/UIAssets/TextrueJson\box.txt
     packgSpritePath: Assets/Res/UIAtlas/box.spriteatlasv2
     lasetJsonGUID: 400626ea8d256573f3183ae708817184
+  imageH: 119.82
+  useGradient: 0
+  topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
+  bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
+  direction: 0
 --- !u!1 &6747014845120676815
 GameObject:
   m_ObjectHideFlags: 0
@@ -1681,14 +1534,13 @@ RectTransform:
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
-  m_Children:
-  - {fileID: 671376058743289274}
+  m_Children: []
   m_Father: {fileID: 6698958863649085951}
   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: 316, y: 354}
-  m_SizeDelta: {x: 94, y: 96}
+  m_SizeDelta: {x: 133, y: 138}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &5426885997382038609
 CanvasRenderer:
@@ -1772,14 +1624,19 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
-  _icon_name: btn_Round06_Red
+  _icon_name: dec_shijian_x
   isNotLoadDeftIcon: 0
-  CurrSpriteAtlas: {fileID: 100100200, guid: 7b02f32fa59cd4e3085208946b112537, type: 3}
+  CurrSpriteAtlas: {fileID: 100100200, guid: b02f6b41a7a9fa8458f4226ab6b3ea47, type: 3}
   packInfo:
-    packName: all
-    packgJsonPath: /Art/UIAssets/TextrueJson/all.txt
-    packgSpritePath: Assets/Res/UIAtlas/all.spriteatlasv2
-    lasetJsonGUID: e8ac4a11df23a3327a9a6fed106efb0a
+    packName: tongyong
+    packgJsonPath: /Art/UIAssets/TextrueJson\tongyong.txt
+    packgSpritePath: Assets/Res/UIAtlas/tongyong.spriteatlasv2
+    lasetJsonGUID: de4a477140878ce911aa37d161cbf014
+  imageH: 96
+  useGradient: 0
+  topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
+  bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
+  direction: 0
 --- !u!1 &6989034640253556327
 GameObject:
   m_ObjectHideFlags: 0
@@ -1941,7 +1798,7 @@ RectTransform:
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchoredPosition: {x: -157, y: -192.3}
-  m_SizeDelta: {x: 221.1, y: 87.3}
+  m_SizeDelta: {x: 253, y: 80}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &8422212410502206005
 CanvasRenderer:
@@ -2016,7 +1873,7 @@ MonoBehaviour:
     m_PersistentCalls:
       m_Calls: []
   m_Sprite: {fileID: 0}
-  m_Type: 1
+  m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
   m_FillMethod: 4
@@ -2025,14 +1882,19 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
-  _icon_name: btn_l_Green
+  _icon_name: btn_lingwu
   isNotLoadDeftIcon: 0
-  CurrSpriteAtlas: {fileID: 100100200, guid: 7b02f32fa59cd4e3085208946b112537, type: 3}
+  CurrSpriteAtlas: {fileID: 100100200, guid: b02f6b41a7a9fa8458f4226ab6b3ea47, type: 3}
   packInfo:
-    packName: all
-    packgJsonPath: /Art/UIAssets/TextrueJson/all.txt
-    packgSpritePath: Assets/Res/UIAtlas/all.spriteatlasv2
-    lasetJsonGUID: fdc09952e21a713f23682168cce500b3
+    packName: tongyong
+    packgJsonPath: /Art/UIAssets/TextrueJson\tongyong.txt
+    packgSpritePath: Assets/Res/UIAtlas/tongyong.spriteatlasv2
+    lasetJsonGUID: de4a477140878ce911aa37d161cbf014
+  imageH: 87.3
+  useGradient: 0
+  topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
+  bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
+  direction: 0
 --- !u!1 &8226326308262195071
 GameObject:
   m_ObjectHideFlags: 0
@@ -2073,7 +1935,7 @@ RectTransform:
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchoredPosition: {x: 139, y: -192.3}
-  m_SizeDelta: {x: 221.1, y: 87.3}
+  m_SizeDelta: {x: 253, y: 80}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &4822061309164038339
 CanvasRenderer:
@@ -2148,7 +2010,7 @@ MonoBehaviour:
     m_PersistentCalls:
       m_Calls: []
   m_Sprite: {fileID: 0}
-  m_Type: 1
+  m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
   m_FillMethod: 4
@@ -2157,14 +2019,19 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
-  _icon_name: btn_l_Green
+  _icon_name: btn_shengji
   isNotLoadDeftIcon: 0
-  CurrSpriteAtlas: {fileID: 100100200, guid: 7b02f32fa59cd4e3085208946b112537, type: 3}
+  CurrSpriteAtlas: {fileID: 100100200, guid: b02f6b41a7a9fa8458f4226ab6b3ea47, type: 3}
   packInfo:
-    packName: all
-    packgJsonPath: /Art/UIAssets/TextrueJson/all.txt
-    packgSpritePath: Assets/Res/UIAtlas/all.spriteatlasv2
-    lasetJsonGUID: fdc09952e21a713f23682168cce500b3
+    packName: tongyong
+    packgJsonPath: /Art/UIAssets/TextrueJson\tongyong.txt
+    packgSpritePath: Assets/Res/UIAtlas/tongyong.spriteatlasv2
+    lasetJsonGUID: de4a477140878ce911aa37d161cbf014
+  imageH: 87.3
+  useGradient: 0
+  topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
+  bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
+  direction: 0
 --- !u!1 &8809557844601942110
 GameObject:
   m_ObjectHideFlags: 0
@@ -2309,7 +2176,7 @@ MonoBehaviour:
       m_Calls: []
   m_Sprite: {fileID: 0}
   m_Type: 0
-  m_PreserveAspect: 0
+  m_PreserveAspect: 1
   m_FillCenter: 1
   m_FillMethod: 4
   m_FillAmount: 1
@@ -2319,9 +2186,14 @@ MonoBehaviour:
   m_PixelsPerUnitMultiplier: 1
   _icon_name: icon_Coin
   isNotLoadDeftIcon: 0
-  CurrSpriteAtlas: {fileID: 100100200, guid: 3855e71da36cb4dfeb0ce0972ed08272, type: 3}
+  CurrSpriteAtlas: {fileID: 100100200, guid: 77f77eea85838ad4b8734050364b4892, type: 3}
   packInfo:
-    packName: allIcon
-    packgJsonPath: /Art/UIAssets/TextrueJson/allIcon.txt
-    packgSpritePath: Assets/Res/UIAtlas/allIcon.spriteatlasv2
-    lasetJsonGUID: 90086c527c943e1bb67739406e95cd52
+    packName: daoju
+    packgJsonPath: /Art/UIAssets/TextrueJson\daoju.txt
+    packgSpritePath: Assets/Res/UIAtlas/daoju.spriteatlasv2
+    lasetJsonGUID: 6e42cc1f96a3da679f0602631c62812a
+  imageH: 45
+  useGradient: 0
+  topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
+  bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
+  direction: 0

Assets/Resources/Shader/Shader Graphs_ShengShiShader.mat

@@ -66,5 +66,5 @@ Material:
     m_Colors:
     - _mainColor: {r: 0.21314356, g: 1.4060051, b: 2.1517377, a: 0}
     - _off: {r: 0.01, g: 0.01, b: 0, a: 0}
-    - _pos: {r: -1.8000001, g: -5.3999996, b: -30, a: 0}
+    - _pos: {r: -4.2020416, g: -5.9337864, b: -30, a: 0}
   m_BuildTextureStacks: []

Assets/Scripts/GameLogic/Player/DropManager.cs

@@ -164,27 +164,26 @@ namespace GameLogic.Player
 
                 ItemInfo itemInfo = null;
 
+
                 if (dropItemConfig.dropItemType == 1)
                 {
-                    itemInfo = new ItemInfo(dropItemConfig.itemID[j], c);
+                    if (c < 0)
+                    {
+                        itemInfo = DropResourceLevel(dropItemConfig.itemID[j], c);
+                    }
+                    else
+                    {
+                        itemInfo = new ItemInfo(dropItemConfig.itemID[j], c);
+                    }
                 }
-                // else if (dropItemConfig.dropItemType == 4)
-                // {
-                //     itemInfo = PlayerManager.Instance.eqController.BuildEquipmentForItemId(dropItemConfig.itemID[0],
-                //         dropItemConfig.itemID[1],
-                //         dropItemConfig.itemID[2]);
-                //     
-                //     j += 2;
-                //     // itemInfo = DropEquipment(dropItemConfig.itemID[j]);
-                // }
                 else
                 {
                     itemInfo = new ItemInfo(dropItemConfig);
                 }
 
+
                 itemInfos.Add(itemInfo);
             }
-            // }
         }
 
         private DropCountConfig GetCountBl(int dropCountGroupID)
@@ -243,7 +242,7 @@ namespace GameLogic.Player
             List<ItemInfo> itemInfos = new List<ItemInfo>();
             if (count < 0)
             {
-                 itemInfos.Add(DropResourceLevel(itemID, count));
+                itemInfos.Add(DropResourceLevel(itemID, count));
             }
             else
             {
@@ -251,7 +250,7 @@ namespace GameLogic.Player
                 if (dropConfig.dropType == 3)
                 {
                     ItemInfo itemInfo = new ItemInfo(dropConfig.dropGroupID[0], count);
-                    itemInfos.Add(itemInfo); 
+                    itemInfos.Add(itemInfo);
                 }
                 else
                 {
@@ -262,6 +261,7 @@ namespace GameLogic.Player
 
             return itemInfos;
         }
+
         public ItemInfo DropResourceLevel(int itemID, int count)
         {
             ResourceLevelConfig resourceLevelConfig = ConfigComponent.Instance.Get<ResourceLevelConfig>(PlayerManager.Instance.myHero.powerUpConfig.ID);

Assets/Scripts/GameLogic/Player/PlayerManager.cs

@@ -48,6 +48,8 @@ public class PlayerManager : Singleton<PlayerManager>
 
     private TimerEntity _timerEntity;
 
+    public bool isLogin;
+
     public void Init()
     {
         AccountFileInfo.Instance.LoadPlayerData();
@@ -88,6 +90,7 @@ public class PlayerManager : Singleton<PlayerManager>
 
         CalculateOfflineRewards();
         AccountFileInfo.Instance.SavePlayerData();
+        isLogin = true;
     }
 
     /// <summary>
@@ -332,6 +335,7 @@ public class PlayerManager : Singleton<PlayerManager>
             {
                 AccountFileInfo.Instance.playerData.QiankundaiDropTimer++;
                 QianKunDaiAward();
+                AccountFileInfo.Instance.SavePlayerData();
             }
         }
 
@@ -469,22 +473,26 @@ public class PlayerManager : Singleton<PlayerManager>
                 }
             }
 
-            AccountFileInfo.Instance.SavePlayerData();
+            // AccountFileInfo.Instance.SavePlayerData();
         }
     }
 
     public void CalculateOfflineRewards()
     {
-        if (AccountFileInfo.Instance.playerData.QiankundaiDropTimer <= PlayerManager.Instance.gameConstantConfig.qiankundaiMaxTime &&  AccountFileInfo.Instance.playerData.ExitTime > 0)
+        // return;
+        if (AccountFileInfo.Instance.playerData.QiankundaiDropTimer <= PlayerManager.Instance.gameConstantConfig.qiankundaiMaxTime && AccountFileInfo.Instance.playerData.ExitTime > 0)
         {
             int miao = (int)((TimeHelper.ClientNow() - AccountFileInfo.Instance.playerData.ExitTime) / 1000);
             miao = AccountFileInfo.Instance.playerData.QiankundaiDropTimer + miao >= PlayerManager.Instance.gameConstantConfig.qiankundaiMaxTime ? PlayerManager.Instance.gameConstantConfig.qiankundaiMaxTime - miao : miao;
             AccountFileInfo.Instance.playerData.QiankundaiDropTimer += miao;
-            PlayerManager.Instance.QianKunDaiAward();
+            for (int i = 0; i < miao; i++)
+            {
+                QianKunDaiAward();
+            }
         }
 
         AccountFileInfo.Instance.playerData.ExitTime = 0;
-         AccountFileInfo.Instance.SavePlayerData();
+        AccountFileInfo.Instance.SavePlayerData();
     }
 
 
@@ -557,7 +565,7 @@ public class PlayerManager : Singleton<PlayerManager>
 
         int qiangDuLevelId = Mathf.CeilToInt(testHeroInfoConfig.level / 5f);
         HeroQiangDuAddConfig heroQiangDuAddConfig = ConfigComponent.Instance.Get<HeroQiangDuAddConfig>(qiangDuLevelId);
-        int index = Mathf.RoundToInt(heroQiangDuAddConfig.qiangDuZhi)-1;
+        int index = Mathf.RoundToInt(heroQiangDuAddConfig.qiangDuZhi) - 1;
         myHero.hp = (EncryptionLong)(myHero.hp.Value * (qiangDu[index] / 100f + 1));
         myHero.attack = (EncryptionLong)(myHero.attack.Value * (qiangDu[index] / 100f + 1));
         myHero.defense = (EncryptionLong)(myHero.defense.Value * (qiangDu[index] / 100f + 1));

Assets/Scripts/GameUI/GameApplctionMono.cs

@@ -61,21 +61,44 @@ namespace GameUI
         //     Debug.Log(m);
         // }
 
-        
-
-        public async void OnApplicationPause(bool pauseStatus)
+        private void OnApplicationFocus(bool hasFocus)
         {
-            if (pauseStatus)
+            if (hasFocus && PlayerManager.Instance.isLogin)
             {
                 // 退出时记录时间
                 AccountFileInfo.Instance.playerData.ExitTime = TimeHelper.ClientNow();
                 AccountFileInfo.Instance.SavePlayerData();
             }
-            else
+            else if(PlayerManager.Instance.isLogin)
             {
                 PlayerManager.Instance.CalculateOfflineRewards();
             }
         }
+
+        private void OnApplicationQuit()
+        {
+            // 退出时记录时间
+            AccountFileInfo.Instance.playerData.ExitTime = TimeHelper.ClientNow();
+            AccountFileInfo.Instance.SavePlayerData();
+            // if (hasFocus)
+            // {
+            //
+            // }
+            // else
+            // {
+            //     PlayerManager.Instance.CalculateOfflineRewards();
+            // }
+        }
+
+        // private void OnApplicationPause(bool pauseStatus)
+        // {
+        //     throw new NotImplementedException();
+        // }
+
+        // public async void OnApplicationPause(bool pauseStatus)
+        // {
+
+        // }
         public void LateUpdate()
         {
             EventSystem.Instance.LateUpdate();

Assets/Scripts/GameUI/UI/BoxPanel/BoxPanel.cs

@@ -77,14 +77,20 @@ namespace Fort23.Mono
 
         public static async void OpenBoxPanel()
         {
-            BoxPanel boxPanel = await UIManager.Instance.LoadAndOpenPanel<BoxPanel>(null, layer: UILayer.Top);
+            BoxPanel boxPanel = await UIManager.Instance.LoadAndOpenPanel<BoxPanel>(null, layer: UILayer.Middle);
             boxPanel.OpenPanel();
         }
 
         private void Init()
         {
-            isAddStack = false;
-            IsShowAppBar = false;
+            isAddStack = true;
+            // IsShowAppBar = false;
+        }
+
+        public override CTask GetFocus()
+        {
+            AppBarPanel.ClosePanel();
+            return base.GetFocus();
         }
 
         protected override void AddEvent()
@@ -132,7 +138,7 @@ namespace Fort23.Mono
                 // YouLoftSDK.Instance.CustomEvent("AdsPlayOver", dic);
                 AccountFileInfo.Instance.playerData.boxFree = true;
                 AccountFileInfo.Instance.SavePlayerData();
-                Btn_AdsFree.gameObject.SetActive(false);
+                // Btn_AdsFree.gameObject.SetActive(false);
 
                 List<ItemInfo> allIitem = await BoxHelper.TenBox(openBoxConfig.ID, true);
                 if (allIitem != null)
@@ -178,14 +184,14 @@ namespace Fort23.Mono
             onCion.text = "x" + openBoxConfig.oneConsume;
             tenCion.text = "x" + openBoxConfig.tenConsume;
 
-            if (AccountFileInfo.Instance.playerData.boxFree)
-            {
-                Btn_AdsFree.gameObject.SetActive(false);
-            }
-            else
-            {
-                Btn_AdsFree.gameObject.SetActive(true);
-            }
+            // if (AccountFileInfo.Instance.playerData.boxFree)
+            // {
+            //     Btn_AdsFree.gameObject.SetActive(false);
+            // }
+            // else
+            // {
+            //     Btn_AdsFree.gameObject.SetActive(true);
+            // }
         }
     }
 }

Assets/Scripts/GameUI/UI/BoxPanel/GachaPanel.cs

@@ -32,6 +32,19 @@ namespace Fort23.Mono
             IsShowAppBar = false;
         }
 
+        public override CTask GetFocus()
+        {
+            AppBarPanel.ClosePanel();
+            TitlePanel.OpenPanel(new List<int>() { GlobalParam.Item_Coin_ID, GlobalParam.Item_Diamond_ID });
+            return base.GetFocus();
+        }
+
+        public override CTask LoseFocus()
+        {
+            TitlePanel.ClosePanel();
+            return base.LoseFocus();
+        }
+
         protected override void AddEvent()
         {
         }
@@ -88,22 +101,22 @@ namespace Fort23.Mono
                 UIManager.Instance.DormancyGComponent(widget);
             }
 
-            _energyWidgets.Clear();
-            EnergyWidget energyWidget = await UIManager.Instance.CreateGComponent<EnergyWidget>(null, Group_ResourceBar);
-            energyWidget.CustomInit(GlobalParam.Item_Coin_ID);
-            _energyWidgets.Add(energyWidget);
-            energyWidget = await UIManager.Instance.CreateGComponent<EnergyWidget>(null, Group_ResourceBar);
-            energyWidget.CustomInit(GlobalParam.Item_Diamond_ID);
-            _energyWidgets.Add(energyWidget);
+            // _energyWidgets.Clear();
+            // EnergyWidget energyWidget = await UIManager.Instance.CreateGComponent<EnergyWidget>(null, Group_ResourceBar);
+            // energyWidget.CustomInit(GlobalParam.Item_Coin_ID);
+            // _energyWidgets.Add(energyWidget);
+            // energyWidget = await UIManager.Instance.CreateGComponent<EnergyWidget>(null, Group_ResourceBar);
+            // energyWidget.CustomInit(GlobalParam.Item_Diamond_ID);
+            // _energyWidgets.Add(energyWidget);
 
             if (type == 1)
             {
-                text_btnText.text = LanguageManager.Instance.Text(1046);
+                text_btnText.text = "开启一次";
                 Trxt_Cion.text = "x" + _openBoxConfig.oneConsume;
             }
             else if (type == 2)
             {
-                text_btnText.text = LanguageManager.Instance.Text(1047);
+                text_btnText.text = "开启十次";
                 Trxt_Cion.text = "x" + _openBoxConfig.tenConsume;
             }
 
@@ -174,8 +187,6 @@ namespace Fort23.Mono
                     fx_ui_box_click.gameObject.SetActive(false);
                     widgetItems[index].SetActive(true);
                     // widgetItems[index].PlayerAnim();
-      
-            
                 });
                 await TimerComponent.Instance.WaitAsync(180 + Random.Range(0, 100));
 
@@ -216,7 +227,7 @@ namespace Fort23.Mono
         {
             if (UIManager.Instance.GetComponent<GachaPanel>() == null || UIManager.Instance.GetComponent<GachaPanel>().IsClose)
             {
-                GachaPanel gachaPanel = await UIManager.Instance.LoadAndOpenPanel<GachaPanel>(null, UILayer.Top, uiData: new object[] { itemInfos, type, configId });
+                GachaPanel gachaPanel = await UIManager.Instance.LoadAndOpenPanel<GachaPanel>(null, UILayer.Middle, uiData: new object[] { itemInfos, type, configId });
                 await TimerComponent.Instance.WaitAsync(300);
                 gachaPanel.CusstomInit();
             }