Merge branch 'hy_dny' of ssh://192.168.0.8:29418/xianjing into hy_dny_rgres

Assets/Content/Prefabs/UI/UICollect/BookItem.prefab

@@ -110,6 +110,7 @@ MonoBehaviour:
   - ToggleHelper
   values: 00010000
   depObjs: []
+  IsNewNode: 0
   activeType: 0
 --- !u!114 &6548550747043813678
 MonoBehaviour:
@@ -325,6 +326,7 @@ MonoBehaviour:
   - UnityEngine.UI.VerticalLayoutGroup
   values: 00000000000100
   depObjs: []
+  IsNewNode: 0
   activeType: 0
 --- !u!1 &367444409256944524
 GameObject:
@@ -504,6 +506,7 @@ MonoBehaviour:
   - UINode
   values: 00000000
   depObjs: []
+  IsNewNode: 0
   activeType: 0
 --- !u!1 &876705399827505072
 GameObject:
@@ -695,6 +698,7 @@ RectTransform:
   - {fileID: 8870630178621989927}
   - {fileID: 7524693267098165660}
   - {fileID: 7545042013204185224}
+  - {fileID: 5836574651343877510}
   m_Father: {fileID: 0}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -736,6 +740,7 @@ MonoBehaviour:
   - UINode
   values: 010000
   depObjs: []
+  IsNewNode: 0
   activeType: 0
 --- !u!1 &1233072111481027443
 GameObject:
@@ -911,6 +916,7 @@ MonoBehaviour:
   values: 00000000
   depObjs:
   - {fileID: 1053823929486321777}
+  IsNewNode: 0
   activeType: 0
 --- !u!1 &1324861929576076844
 GameObject:
@@ -1172,6 +1178,7 @@ MonoBehaviour:
   - ToggleHelper
   values: 00010000
   depObjs: []
+  IsNewNode: 0
   activeType: 0
 --- !u!114 &8038829453633802552
 MonoBehaviour:
@@ -1364,6 +1371,7 @@ MonoBehaviour:
   - UnityEngine.Animator
   values: 000000000100
   depObjs: []
+  IsNewNode: 0
   activeType: 2
 --- !u!114 &1271829726751947250
 MonoBehaviour:
@@ -1542,6 +1550,7 @@ MonoBehaviour:
   - ToggleHelper
   values: 0001000000
   depObjs: []
+  IsNewNode: 0
   activeType: 0
 --- !u!95 &8024869420619517404
 Animator:
@@ -1731,6 +1740,295 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
+--- !u!1 &1535434892143936220
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 2695758773691948301}
+  - component: {fileID: 616487854227192704}
+  - component: {fileID: 619613223057805210}
+  - component: {fileID: 8298656328745946088}
+  m_Layer: 5
+  m_Name: Text
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &2695758773691948301
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1535434892143936220}
+  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: 5836574651343877510}
+  m_RootOrder: 1
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0.5}
+  m_AnchorMax: {x: 1, y: 0.5}
+  m_AnchoredPosition: {x: 0, y: -2}
+  m_SizeDelta: {x: -40, y: 60}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &616487854227192704
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1535434892143936220}
+  m_CullTransparentMesh: 0
+--- !u!114 &619613223057805210
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1535434892143936220}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: ee125e9b69781314f885ad4a52df54f0, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_key: BtnGetAllTxt
+--- !u!114 &8298656328745946088
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1535434892143936220}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_text: "\u4E00\u952E\u9818\u53D6"
+  m_isRightToLeft: 0
+  m_fontAsset: {fileID: 11400000, guid: ff9a33292f9ee2e4bb6b5beaa43eb505, type: 2}
+  m_sharedMaterial: {fileID: 21889736603187208, guid: ff9a33292f9ee2e4bb6b5beaa43eb505,
+    type: 2}
+  m_fontSharedMaterials: []
+  m_fontMaterial: {fileID: 0}
+  m_fontMaterials: []
+  m_fontColor32:
+    serializedVersion: 2
+    rgba: 4294967295
+  m_fontColor: {r: 1, g: 1, b: 1, a: 1}
+  m_enableVertexGradient: 0
+  m_colorMode: 3
+  m_fontColorGradient:
+    topLeft: {r: 1, g: 1, b: 1, a: 1}
+    topRight: {r: 1, g: 1, b: 1, a: 1}
+    bottomLeft: {r: 1, g: 1, b: 1, a: 1}
+    bottomRight: {r: 1, g: 1, b: 1, a: 1}
+  m_fontColorGradientPreset: {fileID: 0}
+  m_spriteAsset: {fileID: 0}
+  m_tintAllSprites: 0
+  m_StyleSheet: {fileID: 0}
+  m_TextStyleHashCode: -1183493901
+  m_overrideHtmlColors: 0
+  m_faceColor:
+    serializedVersion: 2
+    rgba: 4294967295
+  m_fontSize: 44
+  m_fontSizeBase: 44
+  m_fontWeight: 400
+  m_enableAutoSizing: 1
+  m_fontSizeMin: 4
+  m_fontSizeMax: 44
+  m_fontStyle: 0
+  m_HorizontalAlignment: 2
+  m_VerticalAlignment: 512
+  m_textAlignment: 65535
+  m_characterSpacing: 0
+  m_wordSpacing: 0
+  m_lineSpacing: 0
+  m_lineSpacingMax: 0
+  m_paragraphSpacing: 0
+  m_charWidthMaxAdj: 0
+  m_enableWordWrapping: 0
+  m_wordWrappingRatios: 0.4
+  m_overflowMode: 0
+  m_linkedTextComponent: {fileID: 0}
+  parentLinkedComponent: {fileID: 0}
+  m_enableKerning: 1
+  m_enableExtraPadding: 0
+  checkPaddingRequired: 0
+  m_isRichText: 1
+  m_parseCtrlCharacters: 1
+  m_isOrthographic: 1
+  m_isCullingEnabled: 0
+  m_horizontalMapping: 0
+  m_verticalMapping: 0
+  m_uvLineOffset: 0
+  m_geometrySortingOrder: 0
+  m_IsTextObjectScaleStatic: 0
+  m_VertexBufferAutoSizeReduction: 1
+  m_useMaxVisibleDescender: 1
+  m_pageToDisplay: 1
+  m_margin: {x: 0, y: 0, z: 0, w: 0}
+  m_isUsingLegacyAnimationComponent: 0
+  m_isVolumetricText: 0
+  m_hasFontAssetChanged: 0
+  m_baseMaterial: {fileID: 0}
+  m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
+--- !u!1 &1629314069577503735
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 5836574651343877510}
+  - component: {fileID: 4281710130094843164}
+  - component: {fileID: 3080825148542029949}
+  - component: {fileID: 4033022080069675408}
+  - component: {fileID: 7344486399507061839}
+  m_Layer: 5
+  m_Name: BtnReceive
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
+--- !u!224 &5836574651343877510
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1629314069577503735}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1.00032, y: 1.00032, z: 1.00032}
+  m_ConstrainProportionsScale: 0
+  m_Children:
+  - {fileID: 7287148377514160664}
+  - {fileID: 2695758773691948301}
+  m_Father: {fileID: 6794277942446104478}
+  m_RootOrder: 8
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0}
+  m_AnchorMax: {x: 0.5, y: 0}
+  m_AnchoredPosition: {x: 0, y: 120.00003}
+  m_SizeDelta: {x: 260, y: 72}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &4281710130094843164
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1629314069577503735}
+  m_CullTransparentMesh: 0
+--- !u!114 &3080825148542029949
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1629314069577503735}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 8759edc0b8b4b3d4aa8ffef2482e17ee, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  UIName: 
+  keys:
+  - UnityEngine.RectTransform
+  - UnityEngine.CanvasRenderer
+  - UINode
+  - UnityEngine.UI.Button
+  - UnityEngine.Animator
+  values: 0000000100
+  depObjs:
+  - {fileID: 0}
+  IsNewNode: 0
+  activeType: 0
+--- !u!114 &4033022080069675408
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1629314069577503735}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Navigation:
+    m_Mode: 3
+    m_WrapAround: 0
+    m_SelectOnUp: {fileID: 0}
+    m_SelectOnDown: {fileID: 0}
+    m_SelectOnLeft: {fileID: 0}
+    m_SelectOnRight: {fileID: 0}
+  m_Transition: 3
+  m_Colors:
+    m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
+    m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
+    m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
+    m_ColorMultiplier: 1
+    m_FadeDuration: 0.1
+  m_SpriteState:
+    m_HighlightedSprite: {fileID: 0}
+    m_PressedSprite: {fileID: 0}
+    m_SelectedSprite: {fileID: 0}
+    m_DisabledSprite: {fileID: 0}
+  m_AnimationTriggers:
+    m_NormalTrigger: Normal
+    m_HighlightedTrigger: Highlighted
+    m_PressedTrigger: Pressed
+    m_SelectedTrigger: Highlighted
+    m_DisabledTrigger: Disabled
+  m_Interactable: 1
+  m_TargetGraphic: {fileID: 0}
+  m_OnClick:
+    m_PersistentCalls:
+      m_Calls: []
+--- !u!95 &7344486399507061839
+Animator:
+  serializedVersion: 5
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1629314069577503735}
+  m_Enabled: 1
+  m_Avatar: {fileID: 0}
+  m_Controller: {fileID: 9100000, guid: ec099100a25a6e94facf1732e56ceb4c, type: 2}
+  m_CullingMode: 0
+  m_UpdateMode: 0
+  m_ApplyRootMotion: 0
+  m_LinearVelocityBlending: 0
+  m_StabilizeFeet: 0
+  m_WarningMessage: 
+  m_HasTransformHierarchy: 1
+  m_AllowConstantClipSamplingOptimization: 1
+  m_KeepAnimatorStateOnDisable: 0
+  m_WriteDefaultValuesOnDisable: 0
 --- !u!1 &1679742324506174111
 GameObject:
   m_ObjectHideFlags: 0
@@ -1841,6 +2139,7 @@ MonoBehaviour:
   - ToggleHelper
   values: 00010000
   depObjs: []
+  IsNewNode: 0
   activeType: 0
 --- !u!114 &8948530797426155317
 MonoBehaviour:
@@ -1952,6 +2251,7 @@ MonoBehaviour:
   values: 00000000
   depObjs:
   - {fileID: 1053823929486321777}
+  IsNewNode: 0
   activeType: 0
 --- !u!1 &2229513664780101400
 GameObject:
@@ -2126,6 +2426,7 @@ MonoBehaviour:
   values: 00000000
   depObjs:
   - {fileID: 1053823929486321777}
+  IsNewNode: 0
   activeType: 0
 --- !u!1 &2333980869346657748
 GameObject:
@@ -2225,6 +2526,7 @@ MonoBehaviour:
   values: 00000000
   depObjs:
   - {fileID: 6584653903211444630}
+  IsNewNode: 0
   activeType: 0
 --- !u!1 &2358778170139136359
 GameObject:
@@ -2324,6 +2626,7 @@ MonoBehaviour:
   values: 00000000
   depObjs:
   - {fileID: 8104971854534109025}
+  IsNewNode: 0
   activeType: 0
 --- !u!1 &2574780561649048155
 GameObject:
@@ -2649,6 +2952,7 @@ MonoBehaviour:
   values: 00000000
   depObjs:
   - {fileID: 8104971854534109025}
+  IsNewNode: 0
   activeType: 0
 --- !u!1 &2860214861727085142
 GameObject:
@@ -2921,6 +3225,7 @@ MonoBehaviour:
   values: 00000000
   depObjs:
   - {fileID: 6584653903211444630}
+  IsNewNode: 0
   activeType: 0
 --- !u!1 &3116228143699511801
 GameObject:
@@ -3024,6 +3329,7 @@ MonoBehaviour:
   - UINode
   values: 00000000
   depObjs: []
+  IsNewNode: 0
   activeType: 0
 --- !u!1 &3150785301147458901
 GameObject:
@@ -3251,6 +3557,7 @@ MonoBehaviour:
   - UnityEngine.UI.HorizontalLayoutGroup
   values: 00010000
   depObjs: []
+  IsNewNode: 0
   activeType: 0
 --- !u!114 &7399347697020658710
 MonoBehaviour:
@@ -3380,6 +3687,7 @@ MonoBehaviour:
   values: 00000100
   depObjs:
   - {fileID: 6584653903211444630}
+  IsNewNode: 0
   activeType: 0
 --- !u!1 &3295053604909393933
 GameObject:
@@ -3523,6 +3831,7 @@ MonoBehaviour:
   - UINode
   values: 00000000
   depObjs: []
+  IsNewNode: 0
   activeType: 0
 --- !u!1 &3670001514357447508
 GameObject:
@@ -3927,7 +4236,84 @@ MonoBehaviour:
   values: 00000000
   depObjs:
   - {fileID: 6584653903211444630}
+  IsNewNode: 0
   activeType: 0
+--- !u!1 &4801206006888885761
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 7287148377514160664}
+  - component: {fileID: 7735287719805410622}
+  - component: {fileID: 5371317407269740674}
+  m_Layer: 5
+  m_Name: bg
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &7287148377514160664
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4801206006888885761}
+  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: 5836574651343877510}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  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 &7735287719805410622
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4801206006888885761}
+  m_CullTransparentMesh: 0
+--- !u!114 &5371317407269740674
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4801206006888885761}
+  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: 21300000, guid: c2c999d1d9299034abac888d6722a389, type: 3}
+  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!1 &4883391918156604172
 GameObject:
   m_ObjectHideFlags: 0
@@ -4232,6 +4618,7 @@ MonoBehaviour:
   - UINode
   values: 000000
   depObjs: []
+  IsNewNode: 0
   activeType: 0
 --- !u!1 &5464198267500609722
 GameObject:
@@ -4331,6 +4718,7 @@ MonoBehaviour:
   values: 00000000
   depObjs:
   - {fileID: 8104971854534109025}
+  IsNewNode: 0
   activeType: 0
 --- !u!1 &5633577775193457502
 GameObject:
@@ -4449,6 +4837,7 @@ MonoBehaviour:
   values: 0000010000
   depObjs:
   - {fileID: 7079111699071236074}
+  IsNewNode: 0
   activeType: 0
 --- !u!1 &5952455428832271360
 GameObject:
@@ -4850,6 +5239,7 @@ MonoBehaviour:
   values: 00000000
   depObjs:
   - {fileID: 1053823929486321777}
+  IsNewNode: 0
   activeType: 0
 --- !u!1 &6544259754853921721
 GameObject:
@@ -5366,6 +5756,7 @@ MonoBehaviour:
   values: 00000100
   depObjs:
   - {fileID: 8104971854534109025}
+  IsNewNode: 0
   activeType: 0
 --- !u!1 &7579943221705843086
 GameObject:
@@ -5465,6 +5856,7 @@ MonoBehaviour:
   values: 00000000
   depObjs:
   - {fileID: 6136195528536920789}
+  IsNewNode: 0
   activeType: 0
 --- !u!1 &7621706414918475573
 GameObject:
@@ -5644,6 +6036,7 @@ MonoBehaviour:
   values: 00000100
   depObjs:
   - {fileID: 1053823929486321777}
+  IsNewNode: 0
   activeType: 0
 --- !u!1 &7784330954708147671
 GameObject:
@@ -5819,6 +6212,7 @@ MonoBehaviour:
   values: 00000000
   depObjs:
   - {fileID: 6584653903211444630}
+  IsNewNode: 0
   activeType: 0
 --- !u!1 &8028139158079298359
 GameObject:
@@ -5918,6 +6312,7 @@ MonoBehaviour:
   values: 00000000
   depObjs:
   - {fileID: 8104971854534109025}
+  IsNewNode: 0
   activeType: 0
 --- !u!1 &8443728863854388781
 GameObject:

Assets/Editor/AssetBundle/CheckHotResWindownInfo.asset

@@ -48,4 +48,23 @@ MonoBehaviour:
   - {fileID: 11400000, guid: 19a063455ed384245b6b164827c2a07f, type: 2}
   - {fileID: 11400000, guid: c073919380063d54ba234822a8c4444a, type: 2}
   - {fileID: 11400000, guid: 58dd8e224b45b394db008a6c7fca7457, type: 2}
-  Tags: []
+  - {fileID: 11400000, guid: aa51fec65696369478d3b52ff905d295, type: 2}
+  - {fileID: 11400000, guid: afc51689f5e10a340ac5ed2802e4b754, type: 2}
+  Tags:
+  - Hy_Test
+  - Hy_Android
+  - Hy_Ios
+  - Hy_Android_en
+  - HY_Ios_en
+  - Hy_Test_en
+  - Gn_0_1_Android
+  - Gn_0_1_Ios
+  - Gn_Zhuan_Android
+  - Gn_Zhuan_Ios
+  - Hy_Android_ru
+  - Hy_Test_ru
+  - HY_Ios_ru
+  - Hy_Dny-Android
+  - Hy_Dny-IOS
+  - Hy_Dny_Test
+  - "\u4E1C\u5357\u4E9A\u6DF7\u6DC6\u8D44\u6E90"

Assets/Editor/AssetBundle/Hy_Dny-Android-en-new.asset

@@ -0,0 +1,34 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 418e20e24f927b0488ef53e722321384, type: 3}
+  m_Name: Hy_Dny-Android-en-new
+  m_EditorClassIdentifier: 
+  Name: Hy_Dny-Android-en-new
+  CN_Name: "\u4E1C\u5357\u4E9A\u6B63\u5F0F\u670D\uFF08en-new-\u5B89\u5353\uFF09"
+  OldPath: "D:\\\u9879\u76EE\\\u70ED\u66F4\u8D44\u6E90/Hy_Dny-Android-en-new"
+  NewPath: E:/Project/Unity/bt_client_2022_S/Assets/StreamingAssets/AssetsAndroid
+  OutputPath: "D:\\\u9879\u76EE\\\u70ED\u66F4\u8D44\u6E90/Hy_Dny-Android-en-new"
+  BaseNameFileInfoPath: 
+  VersionFileName: Version
+  mainfestFileName: mainfest
+  ResVersion: 0.1.0.0
+  IgnoreFiles: []
+  rG_Ignore_Infos: []
+  Rg_Essential_Infos: []
+  ChangeNum: 0
+  IsIgnore: 1
+  Language: 1
+  IsHx: 0
+  hxKey: ahsdpoi123bdco3kl0lgmvxxx167a
+  abNameHxInfo:
+    HxKey: ahsdpoi123bdco3kl0lgmvxxx167a
+    Infos: []

Assets/Editor/AssetBundle/Hy_Dny-Android-en-new.asset.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: aa51fec65696369478d3b52ff905d295
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Editor/AssetBundle/Hy_Dny-ios-en-new.asset

@@ -0,0 +1,34 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 418e20e24f927b0488ef53e722321384, type: 3}
+  m_Name: Hy_Dny-ios-en-new
+  m_EditorClassIdentifier: 
+  Name: Hy_Dny-ios-en-new
+  CN_Name: "\u4E1C\u5357\u4E9A\u6B63\u5F0F\u670D\uFF08IOS-en-new\uFF09"
+  OldPath: "D:\\\u9879\u76EE\\\u70ED\u66F4\u8D44\u6E90/Hy_Dny-ios-en-new"
+  NewPath: E:/Project/Unity/bt_client_2022_S/Assets/StreamingAssets/unityRes
+  OutputPath: "D:\\\u9879\u76EE\\\u70ED\u66F4\u8D44\u6E90/Hy_Dny-ios-en-new"
+  BaseNameFileInfoPath: 
+  VersionFileName: afivs
+  mainfestFileName: afimft
+  ResVersion: 0.1.0.0
+  IgnoreFiles: []
+  rG_Ignore_Infos: []
+  Rg_Essential_Infos: []
+  ChangeNum: 0
+  IsIgnore: 1
+  Language: 1
+  IsHx: 0
+  hxKey: 4eb0381d1b043c62fbd46f10bcbc2e3
+  abNameHxInfo:
+    HxKey: 4eb0381d1b043c62fbd46f10bcbc2e3
+    Infos: []

Assets/Editor/AssetBundle/Hy_Dny-ios-en-new.asset.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: afc51689f5e10a340ac5ed2802e4b754
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Lua/Core/Constant.lua

@@ -14,6 +14,9 @@ local Constant = {
     OpenLanguageSetting = false,
     LanguageNames = {'cn','en','vi','th'},
 
+
+    OpenGetAll = false,
+
     HeroLeaderIcon = "FrameNew/label_main",
     HeroBattleIcon = "FrameNew/label_battling",
 

Assets/Lua/Logic/CollectionBookData.lua

@@ -58,8 +58,11 @@ function CollectionBookData:QueryCardHandBook(pageId)
     ManagerContainer.NetManager:SendMessage(ProtoMsgId.CS_CARD_COLLECT_INFO_REQ, {})
 end
 
-function CollectionBookData:SendCardHandBookReward(id, lv)
-    ManagerContainer.NetManager:SendMessage(ProtoMsgId.CS_CARD_COLLECT_REWARD_REQ, {card_id = id, level = lv})
+function CollectionBookData:SendCardHandBookReward(id, lv,isGetAll)
+    if  isGetAll == nil then        
+        isGetAll = false
+    end
+    ManagerContainer.NetManager:SendMessage(ProtoMsgId.CS_CARD_COLLECT_REWARD_REQ, {card_id = id, level = lv,get_all = isGetAll})
 end
 
 function CollectionBookData:QueryCardRank(id)

Assets/Lua/Pb/login.txt

@@ -1,5 +1,5 @@
 
-ÂÝ
+ŰÝ
 login.protoserverproto
 user.proto"0
 
@@ -422,10 +422,11 @@ config_ids (2.serverproto.KeyValueTypeR	configIds"q
 CSCardCollectInfoReq"i
 SCCardCollectInfoAck
 error
 
(Rerror;
-card_collect (2.serverproto.CardCollectRcardCollect"G
+card_collect (2.serverproto.CardCollectRcardCollect"`
 CSCardCollectRewardReq
 card_id
 
(RcardId
-level 
(Rlevel"™

+level 
(Rlevel
+get_all 
(RgetAll"™

 SCCardCollectRewardAck
 error
 
(Rerror
 card_id 
(RcardId

Assets/Lua/UI/GridViewItem/BookItem_Generate.lua

@@ -1,3 +1,7 @@
+---@class BookItem__Generate_btnReceive
+---@field public gameObject UnityEngine.GameObject
+---@field public button UnityEngine.UI.Button
+
 ---@class BookItem__Generate_btnBack
 ---@field public gameObject UnityEngine.GameObject
 ---@field public button UnityEngine.UI.Button
@@ -91,6 +95,7 @@
 ---@field private qtyCollection BookItem__Generate_qtyCollection
 ---@field private btnMaterials BookItem__Generate_btnMaterials
 ---@field private btnBack BookItem__Generate_btnBack
+---@field private btnReceive BookItem__Generate_btnReceive
 local BookItemView = class("BookItemView")
 
 function BookItemView:ctor()
@@ -137,6 +142,7 @@ function BookItemView:InitGenerate(Root, data)
 	self:InitGenerate__28(Root,data)
 	self:InitGenerate__29(Root,data)
 	self:InitGenerate__30(Root,data)
+	self:InitGenerate__31(Root,data)
 
 
 end
@@ -523,6 +529,20 @@ function BookItemView:InitGenerate__30(Root, data)
 	tmp.button = tmp:GetComponent(Enum.TypeInfo.Button)
 end
 
+---@private
+function BookItemView:InitGenerate__31(Root, data)
+--[[
+	BtnReceive
+--]]
+	local tmp = Root:Find("BtnReceive").gameObject
+	if tolua.getpeer(tmp) == nil then
+		tolua.setpeer(tmp, {})
+	end
+	self.btnReceive = tmp
+
+	tmp.button = tmp:GetComponent(Enum.TypeInfo.Button)
+end
+
 ---@private
 function BookItemView:GenerateDestroy()
 	if tolua.getpeer(self.btnMaterials.icon) ~= nil then
@@ -624,6 +644,10 @@ function BookItemView:GenerateDestroy()
 		tolua.setpeer(self.btnBack, nil)
 	end
 	self.btnBack = nil
+	if tolua.getpeer(self.btnReceive) ~= nil then
+		tolua.setpeer(self.btnReceive, nil)
+	end
+	self.btnReceive = nil
 	self.transform = nil
 	self.gameObject = nil
 	self.inited = false

Assets/Lua/UI/UICollect/CardBook.lua

@@ -22,6 +22,7 @@ function CardBook:InitPanel()
 
 	self.viewLua.btnMaterials:SetActive(false)
 	self.viewLua.dscBox:SetActive(false)
+	self.viewLua.btnReceive:SetActive(true and Constant.OpenGetAll)
 end
 
 function CardBook:Hide()
@@ -105,6 +106,7 @@ end
 
 function CardBook:AddUIEventListener()
 	self.host.uiBase:AddButtonEventListener(self.viewLua.btnBack.button, self, self.OnBtnBackClick)
+	self.host.uiBase:AddButtonEventListener(self.viewLua.btnReceive.button, self, self.OnBtnReceiveClick)
 end
 
 function CardBook:OnBtnBackClick()
@@ -113,6 +115,10 @@ function CardBook:OnBtnBackClick()
 	end
 end
 
+function CardBook:OnBtnReceiveClick()
+		ManagerContainer.DataMgr.CollectionBookData:SendCardHandBookReward(-1, -1,true)
+end
+
 function CardBook:Dispose()
 
 	self.viewLua.scrollView.loopGridView:Dispose()

Assets/Lua/UI/UICollect/KeepSakeBook.lua

@@ -21,6 +21,7 @@ function KeepSakeBook:InitPanel()
 
 	self.viewLua.btnMaterials:SetActive(true)
 	self.viewLua.dscBox:SetActive(true)
+	self.viewLua.btnReceive:SetActive(false)
 end
 
 function KeepSakeBook:Hide()

Assets/Lua/UI/UICollect/PetBook.lua

@@ -22,6 +22,7 @@ function PetBook:InitPanel()
 
 	self.viewLua.btnMaterials:SetActive(false)
 	self.viewLua.dscBox:SetActive(false)
+	self.viewLua.btnReceive:SetActive(true and Constant.OpenGetAll)
 end
 
 function PetBook:Hide()
@@ -111,6 +112,7 @@ end
 
 function PetBook:AddUIEventListener()
 	self.host.uiBase:AddButtonEventListener(self.viewLua.btnBack.button, self, self.OnBtnBackClick)
+	self.host.uiBase:AddButtonEventListener(self.viewLua.btnReceive.button, self, self.OnBtnReceiveClick)
 end
 
 function PetBook:OnBtnBackClick()
@@ -119,6 +121,9 @@ function PetBook:OnBtnBackClick()
 	end
 end
 
+function PetBook:OnBtnReceiveClick()
+		ManagerContainer.DataMgr.CollectionBookData:SendCardHandBookReward(-1, -1,true)
+end
 function PetBook:Dispose()
 
 	self.viewLua.scrollView.loopGridView:Dispose()

Build/BuildDependenceResource/PackConfig.json

@@ -175,10 +175,10 @@
         },
         {
             "channelName": "i7game",
-            "appName": "超冒险小镇物语2",
-            "distributeName": "測試服--0.1",
+            "appName": "boligp",
+            "distributeName": "測試服--0.1(海外专)",
             "channelUniqueId": "12002009",
-            "bundleId": "com.xjro.yy",
+            "bundleId": "com.xjboligp.yy",
             "gameVersionCode": {
                 "major": 1,
                 "minor": 0,
@@ -208,23 +208,20 @@
             "obscureKey": "",
             "obscureOffsetMin": 0,
             "obscureOffsetValues": [],
-            "sdkVerifyUrl": "http://101.43.46.101:81//",
-            "serverListUrl": "http://101.43.46.101:81//serverlist",
-            "notifyUrl": "http://101.43.46.101:88//res/NoticeNew/",
-            "specialInfoUrl": "http://101.43.46.101:88//res/Channel/agreement.json",
-            "customerServiceInfoUrl": "http://101.43.46.101:81//vipService",
+            "sdkVerifyUrl": "http://43.226.57.217:81//",
+            "serverListUrl": "http://43.226.57.217:81//serverlist",
+            "notifyUrl": "http://43.226.57.217:88//res/NoticeNew/",
+            "specialInfoUrl": "http://43.226.57.217:88//res/Channel/agreement.json",
+            "customerServiceInfoUrl": "http://43.226.57.217:81//vipService",
             "leBian_MainChId": "69423",
             "leBian_ClientChId": "youyi_bt_jj",
             "leBian_SECID": "dmcve6kq.c",
             "plugins": [
                 "common",
-                "Bugly",
-                "FairGuard",
-                "qucik_cn"
+                "YOUYI_1.6.9"
             ],
             "sdkBridges": [
-                "Bugly",
-                "quick_cn_android"
+                "dny_XuanYou_android"
             ],
             "keystoreName": "wenting.keystore",
             "keystorePass": "n9P5j2b7blMm",
@@ -290,10 +287,10 @@
         },
         {
             "channelName": "i7game",
-            "appName": "超冒险小镇物语2",
-            "distributeName": "正式服--0.1",
+            "appName": "xjboli",
+            "distributeName": "正式服--0.1（海外）",
             "channelUniqueId": "12002011",
-            "bundleId": "com.xjro.yy",
+            "bundleId": "com.xjboligp.yy",
             "gameVersionCode": {
                 "major": 1,
                 "minor": 0,
@@ -310,18 +307,20 @@
             "defineSymbols": [
                 "USE_LUA",
                 "VUPLEX_CCU",
-                "BUGLY",
-                "FPS_DISABLE",
-                "CN_I7GAME_0_1"
+                "FPS_DISABLE"
             ],
             "logo1RelativePath": "xlwy.png",
             "loginRelativePath": "i7Game",
             "gameAssetsPath": "Default",
             "specialFuncShield": false,
             "splashScreenRelativeFiles": [],
-            "obscureKey": "",
+            "obscureKey": "74eb0381d1b043c62fbd46f",
             "obscureOffsetMin": 0,
-            "obscureOffsetValues": [],
+            "obscureOffsetValues": [
+                8,
+                4,
+                10
+            ],
             "sdkVerifyUrl": "http://103.239.245.64:81//",
             "serverListUrl": "http://103.239.245.64:81//serverlist",
             "notifyUrl": "http://weix.vvfyj.cn/res/NoticeNew/",
@@ -332,13 +331,10 @@
             "leBian_SECID": "dmcve6kq.c",
             "plugins": [
                 "common",
-                "Bugly",
-                "FairGuard",
-                "qucik_cn"
+                "YOUYI_1.6.9"
             ],
             "sdkBridges": [
-                "Bugly",
-                "quick_cn_android"
+                "dny_XuanYou_android"
             ],
             "keystoreName": "wenting.keystore",
             "keystorePass": "n9P5j2b7blMm",
@@ -935,6 +931,62 @@
             "keystorePass": "n9P5j2b7blMm",
             "keyaliasName": "game",
             "keyaliasPass": "KlYX666Ro"
+        }, 
+        {
+            "channelName": "勉游",
+            "appName": "东南亚正式服(en-new)",
+            "distributeName": "正式服(东南亚)",
+            "channelUniqueId": "12002030",
+            "bundleId": "com.xjro.rutest",
+            "gameVersionCode": {
+                "major": 1,
+                "minor": 0,
+                "release": 0,
+                "patch": 6
+            },
+            "resVersionCode": {
+                "major": 0,
+                "minor": 1,
+                "release": 0,
+                "patch": 0
+            },
+            "iconRelativePath": "XinLiWuYu",
+            "defineSymbols": [
+                "USE_LUA",
+                "VUPLEX_CCU",
+                "FPS_DISABLE"
+            ],
+            "logo1RelativePath": "xlwy.png",
+            "loginRelativePath": "Default",
+            "gameAssetsPath": "Default",
+            "specialFuncShield": false,
+            "splashScreenRelativeFiles": [],
+            "obscureKey": "ahsdpoi123bdco3kl0lgmvxxx167a",
+            "obscureOffsetMin": 0,
+            "obscureOffsetValues": [
+                7,
+                9,
+                5
+            ],
+            "sdkVerifyUrl": "http://43.156.13.116:81//",
+            "serverListUrl": "http://43.156.13.116:81//serverlist",
+            "notifyUrl": "http://43.156.13.116:88/res/NoticeNew/",
+            "specialInfoUrl": "http://43.156.13.116:81//channel",
+            "customerServiceInfoUrl": "http://43.156.13.116:81//vipService",
+            "leBian_MainChId": "69423",
+            "leBian_ClientChId": "youyi_bt_jj",
+            "leBian_SECID": "dmcve6kq.c",
+            "plugins": [
+                "common",
+                "YOUYI_1.6.9"
+            ],
+            "sdkBridges": [
+                "MianYou_android"
+            ],
+            "keystoreName": "wenting.keystore",
+            "keystorePass": "n9P5j2b7blMm",
+            "keyaliasName": "game",
+            "keyaliasPass": "KlYX666Ro"
         },
         {
             "channelName": "游逸",
@@ -1491,11 +1543,11 @@
             "obscureKey": "",
             "obscureOffsetMin": 0,
             "obscureOffsetValues": [],
-            "sdkVerifyUrl": "http://101.43.46.101:81//",
-            "serverListUrl": "http://101.43.46.101:81//serverlist",
-            "notifyUrl": "http://101.43.46.101:88//res/NoticeNew/",
-            "specialInfoUrl": "http://101.43.46.101:88//res/Channel/agreement.json",
-            "customerServiceInfoUrl": "http://101.43.46.101:81//vipService",
+            "sdkVerifyUrl": "http://43.226.57.217:81//",
+            "serverListUrl": "http://43.226.57.217:81//serverlist",
+            "notifyUrl": "http://43.226.57.217:88//res/NoticeNew/",
+            "specialInfoUrl": "http://43.226.57.217:88//res/Channel/agreement.json",
+            "customerServiceInfoUrl": "http://43.226.57.217:81//vipService",
             "leBian_MainChId": "69031",
             "leBian_ClientChId": "cxzjj_bt",
             "leBian_SECID": "tx75web0.c",
@@ -1661,6 +1713,58 @@
                 "XuanYou_IOS"
             ]
         },
+        {
+            "channelName": "勉游-炫游",
+            "appName": "en-new",
+            "distributeName": "正式服（东南亚）",
+            "channelUniqueId": "22003012",
+            "bundleId": "com.qscq.joy",
+            "gameVersionCode": {
+                "major": 0,
+                "minor": 1,
+                "release": 0,
+                "patch": 0
+            },
+            "resVersionCode": {
+                "major": 0,
+                "minor": 1,
+                "release": 0,
+                "patch": 0
+            },
+            "iconRelativePath": "ChuXinZheDaMaoxianNew_IOS",
+            "defineSymbols": [
+                "USE_LUA",
+                "VUPLEX_CCU",
+                "FPS_DISABLE"
+            ],
+            "logo1RelativePath": "ntquick.png",
+            "loginRelativePath": "Default",
+            "gameAssetsPath": "Default",
+            "specialFuncShield": false,
+            "splashScreenRelativeFiles": [],
+            "obscureKey": "4eb0381d1b043c62fbd46f10bcbc2e3",
+            "obscureOffsetMin": 0,
+            "obscureOffsetValues": [
+                8,
+                4,
+                10
+            ],
+            "sdkVerifyUrl": "http://43.156.13.116:81//",
+            "serverListUrl": "http://43.156.13.116:81//serverlist",
+            "notifyUrl": "http://43.156.13.116:88/res/NoticeNew/",
+            "specialInfoUrl": "http://43.156.13.116:81//channel",
+            "customerServiceInfoUrl": "http://43.156.13.116:81//vipService",
+            "leBian_MainChId": "69031",
+            "leBian_ClientChId": "cxzjj_bt",
+            "leBian_SECID": "tx75web0.c",
+            "plugins": [
+                "common",
+                "Xuanyou_SDK_IOS"
+            ],
+            "sdkBridges": [
+                "XuanYou_IOS"
+            ]
+        },
         {
             "channelName": "小龙",
             "appName": "萌新冒險家",

ProtocolGen/proto/login.proto

@@ -640,6 +640,7 @@ message SCCardCollectInfoAck {
 message CSCardCollectRewardReq {  //project game    //RouteRule game
     int32       card_id             = 1;
     int32       level               = 2;
+    bool        get_all                 = 3; //是否领取全部奖励
 }
 message SCCardCollectRewardAck {
     int32    error                         = 1;