Merge remote-tracking branch 'origin/main' into L_uo
# Conflicts: # Assets/StreamingAssets/build_info
This commit is contained in:
@@ -857,81 +857,6 @@ MonoBehaviour:
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
embeddedEventSystem: {fileID: 0}
|
||||
--- !u!1 &1492323856304595027
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 4988076891287784724}
|
||||
- component: {fileID: 856026347749784762}
|
||||
- component: {fileID: 295413513224178492}
|
||||
m_Layer: 5
|
||||
m_Name: fishTideTip
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &4988076891287784724
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1492323856304595027}
|
||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||
m_LocalScale: {x: 0.64, y: 0.64, z: 0.64}
|
||||
m_ConstrainProportionsScale: 1
|
||||
m_Children: []
|
||||
m_Father: {fileID: 5464481632540213191}
|
||||
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: 694, y: 670}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &856026347749784762
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1492323856304595027}
|
||||
m_CullTransparentMesh: 1
|
||||
--- !u!114 &295413513224178492
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1492323856304595027}
|
||||
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: 5505d06595bc63344866f33a19add6e7, type: 3}
|
||||
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 &1586777699486977133
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@@ -1199,6 +1124,121 @@ MonoBehaviour:
|
||||
m_hasFontAssetChanged: 0
|
||||
m_baseMaterial: {fileID: 0}
|
||||
m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
|
||||
--- !u!1 &2020477642095681156
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 1603658081160573357}
|
||||
- component: {fileID: 8207902702652910530}
|
||||
- component: {fileID: 5940804229090731458}
|
||||
- component: {fileID: 5218650357624203885}
|
||||
- component: {fileID: 6021227965716747771}
|
||||
m_Layer: 5
|
||||
m_Name: Canvas (1)
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &1603658081160573357
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 2020477642095681156}
|
||||
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
|
||||
m_LocalPosition: {x: 0, y: 0, z: 0.08}
|
||||
m_LocalScale: {x: 0.012, y: 0.012, z: 0.012}
|
||||
m_ConstrainProportionsScale: 1
|
||||
m_Children:
|
||||
- {fileID: 4446717039291863605}
|
||||
m_Father: {fileID: 7423764907579544229}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 0, y: 0}
|
||||
m_AnchoredPosition: {x: -0.19, y: 2.602}
|
||||
m_SizeDelta: {x: 200, y: 200}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!223 &8207902702652910530
|
||||
Canvas:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 2020477642095681156}
|
||||
m_Enabled: 1
|
||||
serializedVersion: 3
|
||||
m_RenderMode: 2
|
||||
m_Camera: {fileID: 0}
|
||||
m_PlaneDistance: 100
|
||||
m_PixelPerfect: 0
|
||||
m_ReceivesEvents: 1
|
||||
m_OverrideSorting: 0
|
||||
m_OverridePixelPerfect: 0
|
||||
m_SortingBucketNormalizedSize: 0
|
||||
m_VertexColorAlwaysGammaSpace: 0
|
||||
m_AdditionalShaderChannelsFlag: 25
|
||||
m_UpdateRectTransformForStandalone: 0
|
||||
m_SortingLayerID: 0
|
||||
m_SortingOrder: 0
|
||||
m_TargetDisplay: 0
|
||||
--- !u!114 &5940804229090731458
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 2020477642095681156}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_UiScaleMode: 0
|
||||
m_ReferencePixelsPerUnit: 100
|
||||
m_ScaleFactor: 1
|
||||
m_ReferenceResolution: {x: 800, y: 600}
|
||||
m_ScreenMatchMode: 0
|
||||
m_MatchWidthOrHeight: 0
|
||||
m_PhysicalUnit: 3
|
||||
m_FallbackScreenDPI: 96
|
||||
m_DefaultSpriteDPI: 96
|
||||
m_DynamicPixelsPerUnit: 1
|
||||
m_PresetInfoIsWorld: 1
|
||||
--- !u!114 &5218650357624203885
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 2020477642095681156}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_IgnoreReversedGraphics: 1
|
||||
m_BlockingObjects: 0
|
||||
m_BlockingMask:
|
||||
serializedVersion: 2
|
||||
m_Bits: 4294967295
|
||||
--- !u!114 &6021227965716747771
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 2020477642095681156}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 52207f12addcf354380218a5cda9debc, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
--- !u!1 &2049703620743826830
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@@ -1729,7 +1769,6 @@ RectTransform:
|
||||
m_Children:
|
||||
- {fileID: 4490431100939280775}
|
||||
- {fileID: 6055516414187131225}
|
||||
- {fileID: 4988076891287784724}
|
||||
m_Father: {fileID: 342535004237623999}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
@@ -2211,6 +2250,82 @@ MonoBehaviour:
|
||||
coolingImage: {fileID: 3147679427254587836}
|
||||
buyBtn: {fileID: 5629768168614360338}
|
||||
shop: {fileID: 328519264909549483}
|
||||
--- !u!1 &3271693589672872770
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 4446717039291863605}
|
||||
- component: {fileID: 8162182509756163342}
|
||||
- component: {fileID: 5730705718114391811}
|
||||
m_Layer: 5
|
||||
m_Name: FishTideTip
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &4446717039291863605
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 3271693589672872770}
|
||||
m_LocalRotation: {x: 0, y: 1, z: 0, w: 0}
|
||||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||
m_LocalScale: {x: 0.3, y: 0.3, z: 0.3}
|
||||
m_ConstrainProportionsScale: 1
|
||||
m_Children:
|
||||
- {fileID: 886501272926382104}
|
||||
m_Father: {fileID: 1603658081160573357}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 180, 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: 612, y: 570}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &8162182509756163342
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 3271693589672872770}
|
||||
m_CullTransparentMesh: 1
|
||||
--- !u!114 &5730705718114391811
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 3271693589672872770}
|
||||
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: 0ed8f6c54e57041459d7b59513049950, type: 3}
|
||||
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 &3379281123577241161
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@@ -4601,6 +4716,7 @@ MonoBehaviour:
|
||||
- {fileID: 21300000, guid: ba2993af9942b80458b691c9d4e1e711, type: 3}
|
||||
- {fileID: 21300000, guid: e024e4799d53b254d9b8565d563e299c, type: 3}
|
||||
- {fileID: 21300000, guid: aef24346f1d37dc46ad5e30d08c0bdc0, type: 3}
|
||||
shopFishTideTip: {fileID: 3271693589672872770}
|
||||
--- !u!136 &1011166311288243760
|
||||
CapsuleCollider:
|
||||
m_ObjectHideFlags: 0
|
||||
@@ -5129,6 +5245,140 @@ MonoBehaviour:
|
||||
m_FillOrigin: 0
|
||||
m_UseSpriteMesh: 0
|
||||
m_PixelsPerUnitMultiplier: 1
|
||||
--- !u!1 &7046849629653129554
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 886501272926382104}
|
||||
- component: {fileID: 4847974373423279602}
|
||||
- component: {fileID: 3412615886907593802}
|
||||
m_Layer: 5
|
||||
m_Name: Text (TMP)
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &886501272926382104
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 7046849629653129554}
|
||||
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: 4446717039291863605}
|
||||
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: 9.43, y: -23.9}
|
||||
m_SizeDelta: {x: 427.01, y: 50}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &4847974373423279602
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 7046849629653129554}
|
||||
m_CullTransparentMesh: 1
|
||||
--- !u!114 &3412615886907593802
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 7046849629653129554}
|
||||
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: "\u9C7C\u6F6E\u6765\u88AD\uFF0C\u7981\u6B62\u4F7F\u7528"
|
||||
m_isRightToLeft: 0
|
||||
m_fontAsset: {fileID: 11400000, guid: 9861a6325d4fe384cabed1305ec8e929, type: 2}
|
||||
m_sharedMaterial: {fileID: -709690668904339887, guid: 9861a6325d4fe384cabed1305ec8e929, 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: 36
|
||||
m_fontSizeBase: 36
|
||||
m_fontWeight: 400
|
||||
m_enableAutoSizing: 0
|
||||
m_fontSizeMin: 18
|
||||
m_fontSizeMax: 72
|
||||
m_fontStyle: 0
|
||||
m_HorizontalAlignment: 2
|
||||
m_VerticalAlignment: 512
|
||||
m_textAlignment: 65535
|
||||
m_characterSpacing: 0
|
||||
m_wordSpacing: 0
|
||||
m_lineSpacing: 0
|
||||
m_lineSpacingMax: 0
|
||||
m_paragraphSpacing: 0
|
||||
m_charWidthMaxAdj: 0
|
||||
m_enableWordWrapping: 1
|
||||
m_wordWrappingRatios: 0.4
|
||||
m_overflowMode: 0
|
||||
m_linkedTextComponent: {fileID: 0}
|
||||
parentLinkedComponent: {fileID: 0}
|
||||
m_enableKerning: 1
|
||||
m_enableExtraPadding: 0
|
||||
checkPaddingRequired: 0
|
||||
m_isRichText: 1
|
||||
m_parseCtrlCharacters: 1
|
||||
m_isOrthographic: 1
|
||||
m_isCullingEnabled: 0
|
||||
m_horizontalMapping: 0
|
||||
m_verticalMapping: 0
|
||||
m_uvLineOffset: 0
|
||||
m_geometrySortingOrder: 0
|
||||
m_IsTextObjectScaleStatic: 0
|
||||
m_VertexBufferAutoSizeReduction: 0
|
||||
m_useMaxVisibleDescender: 1
|
||||
m_pageToDisplay: 1
|
||||
m_margin: {x: 0, y: 0, z: 0, w: 0}
|
||||
m_isUsingLegacyAnimationComponent: 0
|
||||
m_isVolumetricText: 0
|
||||
m_hasFontAssetChanged: 0
|
||||
m_baseMaterial: {fileID: 0}
|
||||
m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
|
||||
--- !u!1 &7101004918880869343
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@@ -5991,7 +6241,10 @@ PrefabInstance:
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents: []
|
||||
m_RemovedGameObjects: []
|
||||
m_AddedGameObjects: []
|
||||
m_AddedGameObjects:
|
||||
- targetCorrespondingSourceObject: {fileID: 450930, guid: 5d24c8b5c9abd754d877d25ebd733bdf, type: 3}
|
||||
insertIndex: -1
|
||||
addedObject: {fileID: 1603658081160573357}
|
||||
m_AddedComponents: []
|
||||
m_SourcePrefab: {fileID: 100100000, guid: 5d24c8b5c9abd754d877d25ebd733bdf, type: 3}
|
||||
--- !u!4 &7423764907579544229 stripped
|
||||
|
||||
@@ -1 +1 @@
|
||||
{"FishData":{"Columns":["ID","FishId","Name","CoinValue","CoinCount","FishCount","Odds","RefreshTime","IntervalTime","Feature","Speed","Value","Rate_1","Rate_2"],"Values":[[ 1, 1,"\u5C0F\u5149\u9C7C", 1, 1,"(8,12)", 25, 1, 1,"\u5FEB\u901F\u7EBF\u6027\u6E38\u52A8\uFF0C\u5BC6\u96C6\u7FA4\u6E38", 2,"\u4F4E","\u4EA7\u751F\u65F6\u9644\u5E2630%\u51E0\u7387\u4E00\u8D77\u51FA\u4E2D\u4EF7\u503C\u4EFB\u610F\u9C7C","\u5982\u679C\u8FDE\u7EED3\u6B21\u672A\u51FA\u73B0\u4E2D\u4EF7\u503C\u9C7C\uFF0C\u5219\u4E0B\u4E00\u6B21\u4E2D\u4EF7\u503C\u9C7C\u5237\u65B0\u51E0\u7387\u7FFB\u500D(\u53EF\u53E0\u52A0),\u76F4\u5230\u51FA\u73B0\u4E2D\u4EF7\u503C\u9C7C\u79CD\u540E\u91CD\u7F6E"],[ 2, 2,"\u5C0F\u9EC4\u9C7C", 2, 2,"(6,10)", 20, 1, 1.2,"\u5C0F\u5E45\u968F\u673A\u8F6C\u5411\uFF0C\u4E2D\u7B49\u5BC6\u5EA6", 1.5,"\u4F4E","\u4EA7\u751F\u65F6\u9644\u5E2631%\u51E0\u7387\u4E00\u8D77\u51FA\u4E2D\u4EF7\u503C\u4EFB\u610F\u9C7C","\u5982\u679C\u8FDE\u7EED3\u6B21\u672A\u51FA\u73B0\u4E2D\u4EF7\u503C\u9C7C\uFF0C\u5219\u4E0B\u4E00\u6B21\u4E2D\u4EF7\u503C\u9C7C\u79CD\u5237\u65B0\u51E0\u7387\u7FFB\u500D\uFF08\u53EF\u53E0\u52A0\uFF09\uFF0C\u76F4\u5230\u51FA\u73B0\u4E2D\u4EF7\u503C\u9C7C\u79CD\u540E\u91CD\u7F6E"],[ 3, 3,"\u795E\u4ED9\u9C7C", 4, 4,"(4,8)", 15, 1, 1.5,"\u5300\u901F\u76F4\u7EBF\u6E38\u52A8\uFF0C\u677E\u6563\u7FA4\u6E38", 1,"\u4F4E","\u4EA7\u751F\u65F6\u9644\u5E2632%\u51E0\u7387\u4E00\u8D77\u51FA\u4E2D\u4EF7\u503C\u4EFB\u610F\u9C7C","\u5982\u679C\u8FDE\u7EED3\u6B21\u672A\u51FA\u73B0\u4E2D\u4EF7\u503C\u9C7C\uFF0C\u5219\u4E0B\u4E00\u6B21\u4E2D\u4EF7\u503C\u9C7C\u79CD\u5237\u65B0\u51E0\u7387\u7FFB\u500D\uFF08\u53EF\u53E0\u52A0\uFF09\uFF0C\u76F4\u5230\u51FA\u73B0\u4E2D\u4EF7\u503C\u9C7C\u79CD\u540E\u91CD\u7F6E"],[ 4, 4,"\u6CB3\u8C5A\u9C7C", 7, 7,"(3,6)", 12, 1, 1.8,"\u7F13\u6162\u66F2\u7EBF\u6E38\u52A8\uFF0C\u6210\u5BF9\u51FA\u73B0",0.5,"\u4F4E","\u4EA7\u751F\u65F6\u9644\u5E2633%\u51E0\u7387\u4E00\u8D77\u51FA\u4E2D\u4EF7\u503C\u4EFB\u610F\u9C7C","\u5982\u679C\u8FDE\u7EED3\u6B21\u672A\u51FA\u73B0\u4E2D\u4EF7\u503C\u9C7C\uFF0C\u5219\u4E0B\u4E00\u6B21\u4E2D\u4EF7\u503C\u9C7C\u79CD\u5237\u65B0\u51E0\u7387\u7FFB\u500D\uFF08\u53EF\u53E0\u52A0\uFF09\uFF0C\u76F4\u5230\u51FA\u73B0\u4E2D\u4EF7\u503C\u9C7C\u79CD\u540E\u91CD\u7F6E"],[ 5, 5,"\u5C0F\u4E11\u9C7C", 10, 10,"(2,5)", 10, 1, 2,"\u4E2D\u7B49\u901F\u5EA6\uFF0C\u8F7B\u5FAE\u968F\u673A\u53D8\u5411", 1,"\u4E2D","\/","\/"],[ 6, 6,"\u9CCA\u9C7C", 20, 10,"(1,4)", 8, 1, 2.5,"\u6162\u901F\u6E38\u52A8\uFF0C\u5076\u5C14\u505C\u987F",0.5,"\u4E2D","\/","\/"],[ 7, 7,"\u7EA2\u886B\u9C7C", 30, 10,"(1,3)", 6, 1, 3,"\u5300\u901F\u66F2\u7EBF\u6E38\u52A8\uFF0C\u5355\u72EC\u6216\u5C0F\u7FA4", 1,"\u4E2D","\/","\/"],[ 8, 8,"\u6D77\u9F9F", 40, 10,"(1,1)", 4, 1, 3.5,"\u6781\u6162\u6E38\u52A8\uFF0C\u56FA\u5B9A\u8F68\u8FF9",0.3,"\u4E2D","\/","\/"],[ 9, 9,"\u706F\u7B3C\u9C7C", 50, 10,"(1,1)", 2.5, 1, 4,"\u4E2D\u901F\u76F4\u7EBF\uFF0C\u5355\u72EC\u6E38\u52A8", 1,"\u4E2D","\/","\/"],[ 10, 10,"\u9B54\u9B3C\u9C7C", 60, 10,"(1,1)", 1.2, 1, 5,"\u6162\u901F\u66F2\u7EBF\uFF0C\u5355\u72EC\u6E38\u52A8",0.5,"\u9AD8","\u51FA\u73B0\u540C\u65F6\u4E0D\u4F1A\u51FA\u73B0\u5176\u5B83\u9AD8\u4EF7\u503C\u9C7C\u79CD","\/"],[ 11, 11,"\u9CA8\u9C7C", 100, 10,"(1,1)",0.8, 1, 6,"\u5FEB\u901F\u51B2\u523A + \u505C\u987F\uFF0C\u5355\u72EC\u6E38\u52A8", 1.5,"\u9AD8","\u51FA\u73B0\u540C\u65F6\u4E0D\u4F1A\u51FA\u73B0\u5176\u5B83\u9AD8\u4EF7\u503C\u9C7C\u79CD","\/"],[ 12, 12,"\u5929\u4F7F\u9A6C", 200, 20,"(1,1)",0.5, 1, 8,"\u4E2D\u901F\u5300\u901F\uFF0C\u5355\u72EC\u51FA\u52A8", 1,"\u7279\u9AD8","\u51FA\u73B0\u540C\u65F6\u4E0D\u4F1A\u51FA\u73B0\u5176\u5B83\u9AD8\u4EF7\u503C\u9C7C\u79CD","\u5929\u4F7F\u9A6C\u4EC5\u57289\u5206\u949F\u524D\u540E3\u5206\u949F\u5185\u5237\u65B0\u6982\u7387\u7FFB\u500D\uFF08\u5982\u679C\u8FD96\u5206\u949F\u5185\u4E0D\u80FD\u89E6\u53D1\uFF0C\u5219\u7B2C13\u5206\u949F\u51C6\u65F6\u5FC5\u5B9A\u89E6\u53D1\u3002"]]},"PlayerBulletData":{"Columns":["ID","Name","Name_CN","Damage","Number"],"Values":[[ 1,"PlayerWeapon1","\u521D\u59CB\u5355\u70B9\u67AA","((200,300))",-1],[ 2,"PlayerWeapon2","LV1\u67AA","((250,350))", 60],[ 3,"PlayerWeapon3","LV2\u67AA","((200,300))", 60],[ 4,"PlayerWeapon4","LV3\u67AA","((300,400))", 60]]},"ShopItemData":{"Columns":["ID","Name","Count","Time","Coin"],"Values":[[ 1,"2\u7EA7\u67AA", 1,-1, 50],[ 2,"3\u7EA7\u67AA", 1,-1, 100],[ 3,"4\u7EA7\u67AA", 1,-1, 250],[ 4,"5\u7EA7\u67AA", 1,-1, 500],[ 5,"\u9CA8\u9C7C",-1, 60, 50],[ 6,"\u5929\u4F7F\u9A6C",-1, 60, 100],[ 7,"\u65F6\u949F",-1, 30, 100],[ 8,"\u53CC\u500D",-1, 30, 150],[ 9,"\u8D85\u7EA7\u7F51",-1, 30, 1000]]}}
|
||||
{"FishData":{"Columns":["ID","FishId","Name","CoinValue","CoinCount","FishCount","Odds","RefreshTime","IntervalTime","Feature","Speed","Value","Rate_1","Rate_2"],"Values":[[ 1, 1,"\u5C0F\u5149\u9C7C", 1, 1,"(8,12)", 25, 1, 1,"\u5FEB\u901F\u7EBF\u6027\u6E38\u52A8\uFF0C\u5BC6\u96C6\u7FA4\u6E38", 2,"\u4F4E","\u4EA7\u751F\u65F6\u9644\u5E2630%\u51E0\u7387\u4E00\u8D77\u51FA\u4E2D\u4EF7\u503C\u4EFB\u610F\u9C7C","\u5982\u679C\u8FDE\u7EED3\u6B21\u672A\u51FA\u73B0\u4E2D\u4EF7\u503C\u9C7C\uFF0C\u5219\u4E0B\u4E00\u6B21\u4E2D\u4EF7\u503C\u9C7C\u5237\u65B0\u51E0\u7387\u7FFB\u500D(\u53EF\u53E0\u52A0),\u76F4\u5230\u51FA\u73B0\u4E2D\u4EF7\u503C\u9C7C\u79CD\u540E\u91CD\u7F6E"],[ 2, 2,"\u5C0F\u9EC4\u9C7C", 2, 2,"(6,10)", 20, 1, 1.2,"\u5C0F\u5E45\u968F\u673A\u8F6C\u5411\uFF0C\u4E2D\u7B49\u5BC6\u5EA6", 1.5,"\u4F4E","\u4EA7\u751F\u65F6\u9644\u5E2631%\u51E0\u7387\u4E00\u8D77\u51FA\u4E2D\u4EF7\u503C\u4EFB\u610F\u9C7C","\u5982\u679C\u8FDE\u7EED3\u6B21\u672A\u51FA\u73B0\u4E2D\u4EF7\u503C\u9C7C\uFF0C\u5219\u4E0B\u4E00\u6B21\u4E2D\u4EF7\u503C\u9C7C\u79CD\u5237\u65B0\u51E0\u7387\u7FFB\u500D\uFF08\u53EF\u53E0\u52A0\uFF09\uFF0C\u76F4\u5230\u51FA\u73B0\u4E2D\u4EF7\u503C\u9C7C\u79CD\u540E\u91CD\u7F6E"],[ 3, 3,"\u795E\u4ED9\u9C7C", 4, 4,"(4,8)", 15, 1, 1.5,"\u5300\u901F\u76F4\u7EBF\u6E38\u52A8\uFF0C\u677E\u6563\u7FA4\u6E38", 1,"\u4F4E","\u4EA7\u751F\u65F6\u9644\u5E2632%\u51E0\u7387\u4E00\u8D77\u51FA\u4E2D\u4EF7\u503C\u4EFB\u610F\u9C7C","\u5982\u679C\u8FDE\u7EED3\u6B21\u672A\u51FA\u73B0\u4E2D\u4EF7\u503C\u9C7C\uFF0C\u5219\u4E0B\u4E00\u6B21\u4E2D\u4EF7\u503C\u9C7C\u79CD\u5237\u65B0\u51E0\u7387\u7FFB\u500D\uFF08\u53EF\u53E0\u52A0\uFF09\uFF0C\u76F4\u5230\u51FA\u73B0\u4E2D\u4EF7\u503C\u9C7C\u79CD\u540E\u91CD\u7F6E"],[ 4, 4,"\u6CB3\u8C5A\u9C7C", 7, 7,"(3,6)", 12, 1, 1.8,"\u7F13\u6162\u66F2\u7EBF\u6E38\u52A8\uFF0C\u6210\u5BF9\u51FA\u73B0",0.5,"\u4F4E","\u4EA7\u751F\u65F6\u9644\u5E2633%\u51E0\u7387\u4E00\u8D77\u51FA\u4E2D\u4EF7\u503C\u4EFB\u610F\u9C7C","\u5982\u679C\u8FDE\u7EED3\u6B21\u672A\u51FA\u73B0\u4E2D\u4EF7\u503C\u9C7C\uFF0C\u5219\u4E0B\u4E00\u6B21\u4E2D\u4EF7\u503C\u9C7C\u79CD\u5237\u65B0\u51E0\u7387\u7FFB\u500D\uFF08\u53EF\u53E0\u52A0\uFF09\uFF0C\u76F4\u5230\u51FA\u73B0\u4E2D\u4EF7\u503C\u9C7C\u79CD\u540E\u91CD\u7F6E"],[ 5, 5,"\u5C0F\u4E11\u9C7C", 10, 10,"(2,5)", 10, 1, 2,"\u4E2D\u7B49\u901F\u5EA6\uFF0C\u8F7B\u5FAE\u968F\u673A\u53D8\u5411", 1,"\u4E2D","\/","\/"],[ 6, 6,"\u9CCA\u9C7C", 20, 10,"(1,4)", 8, 1, 2.5,"\u6162\u901F\u6E38\u52A8\uFF0C\u5076\u5C14\u505C\u987F",0.5,"\u4E2D","\/","\/"],[ 7, 7,"\u7EA2\u886B\u9C7C", 30, 10,"(1,3)", 6, 1, 3,"\u5300\u901F\u66F2\u7EBF\u6E38\u52A8\uFF0C\u5355\u72EC\u6216\u5C0F\u7FA4", 1,"\u4E2D","\/","\/"],[ 8, 8,"\u6D77\u9F9F", 40, 10,"(1,1)", 4, 1, 3.5,"\u6781\u6162\u6E38\u52A8\uFF0C\u56FA\u5B9A\u8F68\u8FF9",0.1,"\u4E2D","\/","\/"],[ 9, 9,"\u706F\u7B3C\u9C7C", 50, 10,"(1,1)", 2.5, 1, 4,"\u4E2D\u901F\u76F4\u7EBF\uFF0C\u5355\u72EC\u6E38\u52A8", 1,"\u4E2D","\/","\/"],[ 10, 10,"\u9B54\u9B3C\u9C7C", 60, 10,"(1,1)", 1.2, 1, 5,"\u6162\u901F\u66F2\u7EBF\uFF0C\u5355\u72EC\u6E38\u52A8",0.5,"\u9AD8","\u51FA\u73B0\u540C\u65F6\u4E0D\u4F1A\u51FA\u73B0\u5176\u5B83\u9AD8\u4EF7\u503C\u9C7C\u79CD","\/"],[ 11, 11,"\u9CA8\u9C7C", 100, 10,"(1,1)",0.8, 1, 6,"\u5FEB\u901F\u51B2\u523A + \u505C\u987F\uFF0C\u5355\u72EC\u6E38\u52A8", 1.5,"\u9AD8","\u51FA\u73B0\u540C\u65F6\u4E0D\u4F1A\u51FA\u73B0\u5176\u5B83\u9AD8\u4EF7\u503C\u9C7C\u79CD","\/"],[ 12, 12,"\u5929\u4F7F\u9A6C", 200, 20,"(1,1)",0.5, 1, 8,"\u4E2D\u901F\u5300\u901F\uFF0C\u5355\u72EC\u51FA\u52A8", 1,"\u7279\u9AD8","\u51FA\u73B0\u540C\u65F6\u4E0D\u4F1A\u51FA\u73B0\u5176\u5B83\u9AD8\u4EF7\u503C\u9C7C\u79CD","\u5929\u4F7F\u9A6C\u4EC5\u57289\u5206\u949F\u524D\u540E3\u5206\u949F\u5185\u5237\u65B0\u6982\u7387\u7FFB\u500D\uFF08\u5982\u679C\u8FD96\u5206\u949F\u5185\u4E0D\u80FD\u89E6\u53D1\uFF0C\u5219\u7B2C13\u5206\u949F\u51C6\u65F6\u5FC5\u5B9A\u89E6\u53D1\u3002"]]},"PlayerBulletData":{"Columns":["ID","Name","Name_CN","Damage","Number"],"Values":[[ 1,"PlayerWeapon1","\u521D\u59CB\u5355\u70B9\u67AA","((200,300))",-1],[ 2,"PlayerWeapon2","LV1\u67AA","((250,350))", 60],[ 3,"PlayerWeapon3","LV2\u67AA","((200,300))", 60],[ 4,"PlayerWeapon4","LV3\u67AA","((300,400))", 60]]},"ShopItemData":{"Columns":["ID","Name","Count","Time","Coin"],"Values":[[ 1,"2\u7EA7\u67AA", 1,-1, 500],[ 2,"3\u7EA7\u67AA", 1,-1, 1000],[ 3,"4\u7EA7\u67AA", 1,-1, 1500],[ 4,"5\u7EA7\u67AA", 1,-1, 3000],[ 5,"\u9CA8\u9C7C",-1, 60, 50],[ 6,"\u5929\u4F7F\u9A6C",-1, 60, 100],[ 7,"\u65F6\u949F",-1, 30, 300],[ 8,"\u53CC\u500D",-1, 30, 350],[ 9,"\u8D85\u7EA7\u7F51",-1, 30, 1000]]}}
|
||||
|
||||
Binary file not shown.
@@ -75,7 +75,7 @@ public class FishSpawner : MonoBehaviour
|
||||
|
||||
void Update()
|
||||
{
|
||||
if(!GameManager.Ins.GameStart)
|
||||
if(!GameManager.Ins.isGamePlay)
|
||||
return;
|
||||
timer += Time.deltaTime;
|
||||
|
||||
@@ -89,8 +89,14 @@ public class FishSpawner : MonoBehaviour
|
||||
fishTideTimer += Time.deltaTime;
|
||||
if (fishTideTimer >= 200&& !IsFishTide)
|
||||
{
|
||||
GameManager.Ins.StartFishTideEvent();
|
||||
fishTideTimer = 0;
|
||||
if (GameInit.Ins.self.handState == handState.Gun)
|
||||
{
|
||||
GameManager.Ins.StartFishTideEvent();
|
||||
}
|
||||
else
|
||||
{
|
||||
fishTideTimer = 0;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -452,7 +458,7 @@ public class FishSpawner : MonoBehaviour
|
||||
Destroy(fishTideRoot);
|
||||
fishTideRoot = null;
|
||||
}
|
||||
|
||||
GameManager.Ins.Shop.HideFishFideTip();
|
||||
fishSpeed = 1f;
|
||||
}
|
||||
|
||||
|
||||
@@ -21,6 +21,8 @@ public class Shop : MonoBehaviour
|
||||
|
||||
public Sprite[] shopItemSprites;
|
||||
|
||||
public GameObject shopFishTideTip;
|
||||
|
||||
private int currentShowCoin;
|
||||
private Tween coinTween;
|
||||
|
||||
@@ -52,6 +54,7 @@ public class Shop : MonoBehaviour
|
||||
EventDispatcher.AddEventListener<int>("RefreshPlayerCoin", RefreshPlayerCoin);
|
||||
EventDispatcher.AddEventListener<int>("ShowTip", ShowTip);
|
||||
EventDispatcher.AddEventListener<int>("HideShop", HideShop);
|
||||
shopFishTideTip.gameObject.SetActive(false);
|
||||
}
|
||||
|
||||
public void ShowShopUI()
|
||||
@@ -86,7 +89,7 @@ public class Shop : MonoBehaviour
|
||||
}
|
||||
private void OnTriggerEnter(Collider other)
|
||||
{
|
||||
if(other.tag == "Player"&&!GameManager.Ins.isGameEnd)
|
||||
if(other.tag == "Player"&&!GameManager.Ins.isGameEnd&& !GameManager.Ins.fishSpawner.IsFishTide)
|
||||
ShowShopUI();
|
||||
}
|
||||
|
||||
@@ -147,4 +150,14 @@ public class Shop : MonoBehaviour
|
||||
item.CheckGunBuyBtn(id);
|
||||
}
|
||||
}
|
||||
|
||||
public void ShowFishFideTip()
|
||||
{
|
||||
shopFishTideTip.SetActive(true);
|
||||
}
|
||||
|
||||
public void HideFishFideTip()
|
||||
{
|
||||
shopFishTideTip.SetActive(false);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -43,8 +43,6 @@ public class ShopItem : MonoBehaviour
|
||||
{
|
||||
if(GameManager.Ins.isGameEnd)
|
||||
return;
|
||||
if(GameManager.Ins.fishSpawner.IsFishTide)
|
||||
return;
|
||||
if (GameInit.Ins.self.GetCoinCount() < _data.Coin)
|
||||
{
|
||||
ShowTip(0);
|
||||
|
||||
@@ -177,20 +177,18 @@ public class GameManager : MonoBehaviour
|
||||
[NonSerialized]
|
||||
public RightHand rightHand;
|
||||
|
||||
[NonReorderable]
|
||||
public Shop Shop;
|
||||
|
||||
public FishSpawner fishSpawner;
|
||||
|
||||
public DriftBottleManager driftBottleManager;
|
||||
|
||||
public bool GameStart = false;
|
||||
|
||||
|
||||
public bool isGameEnd = false;
|
||||
|
||||
public bool isFishTide = false;
|
||||
|
||||
|
||||
public LoginInfo authInfo = new LoginInfo();
|
||||
|
||||
public List<GameObject> itemList = new List<GameObject>();
|
||||
public LoginPanel log;
|
||||
//添加
|
||||
[Header("AI角色")]
|
||||
public GameObject aiCharacterPre;//AI角色预制体
|
||||
@@ -451,7 +449,6 @@ public class GameManager : MonoBehaviour
|
||||
|
||||
public void CreateGameStartPoint()
|
||||
{
|
||||
GameStart = true;
|
||||
isGamePlay = false;
|
||||
GameObject point = Instantiate(gameStartPointPre);
|
||||
point.transform.position = GameInit.Ins.startDoorPos.position;
|
||||
@@ -489,6 +486,7 @@ public class GameManager : MonoBehaviour
|
||||
point.transform.position = GameInit.Ins.showPos.position;
|
||||
point.transform.rotation = GameInit.Ins.showPos.rotation;
|
||||
point.transform.localScale = GameInit.Ins.showPos.localScale;
|
||||
Shop=point.GetComponent<Shop>();
|
||||
}
|
||||
|
||||
public void CreateItemPre()
|
||||
@@ -635,6 +633,7 @@ public class GameManager : MonoBehaviour
|
||||
CreateFishTide();
|
||||
PlaySound2D("鱼潮事件NPC语音");
|
||||
fishSpawner.StartFishTide();
|
||||
Shop.ShowFishFideTip();
|
||||
}
|
||||
|
||||
#endregion
|
||||
|
||||
@@ -1,18 +1,21 @@
|
||||
using System;
|
||||
using System.Collections;
|
||||
using System.Collections.Generic;
|
||||
using DragonLi.Core;
|
||||
using UnityEngine;
|
||||
|
||||
public class LookPlayer : MonoBehaviour
|
||||
{
|
||||
private Transform player;
|
||||
|
||||
private void OnEnable()
|
||||
{
|
||||
|
||||
player = GameManager.Ins.player.transform;
|
||||
}
|
||||
|
||||
private void Update()
|
||||
{
|
||||
transform.LookAt(GameManager.Ins.player.transform.position.ReflectVectorXOZ());
|
||||
Vector3 dir = player.position - transform.position;
|
||||
dir.y = 0f; // ⭐ 关键：忽略高度，只算水平朝向
|
||||
|
||||
if (dir.sqrMagnitude < 0.001f) return;
|
||||
|
||||
transform.rotation = Quaternion.LookRotation(dir);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -8,6 +8,12 @@ using UnityEngine;
|
||||
using UnityEngine.XR;
|
||||
using Random = UnityEngine.Random;
|
||||
|
||||
|
||||
public enum handState
|
||||
{
|
||||
Hand,
|
||||
Gun,
|
||||
}
|
||||
/// <summary>
|
||||
/// 玩家控制脚本：
|
||||
/// - 管理生命值、拾取道具；
|
||||
@@ -31,6 +37,8 @@ public class Player : MonoBehaviour
|
||||
public int GetCoinIndex;
|
||||
|
||||
[NonSerialized] public int Score;
|
||||
|
||||
[NonSerialized] public handState handState;
|
||||
|
||||
[Header("玩家最大血量")]
|
||||
private float maxHp = 50;
|
||||
@@ -69,6 +77,7 @@ public class Player : MonoBehaviour
|
||||
currentHp = maxHp;
|
||||
GameInit.Ins.self = this;
|
||||
GetCoinIndex = 1;
|
||||
handState = handState.Gun;
|
||||
EventDispatcher.TriggerEvent("GetHand", LeftHand, RightHand);
|
||||
}
|
||||
|
||||
@@ -123,7 +132,6 @@ public class Player : MonoBehaviour
|
||||
if (currentHp <= 0 && IsAlive)
|
||||
{
|
||||
IsAlive = false;
|
||||
GameManager.Ins.GameStart = false;
|
||||
GameInit.Ins.DieUI.SetActive(true);
|
||||
|
||||
EventDispatcher.TriggerEvent("PlayerDeath",transform);
|
||||
@@ -131,7 +139,6 @@ public class Player : MonoBehaviour
|
||||
{
|
||||
IsAlive = true;
|
||||
GameInit.Ins.DieUI.SetActive(false);
|
||||
GameManager.Ins.GameStart = true;
|
||||
currentHp = maxHp;
|
||||
EventDispatcher.TriggerEvent("HpChange", currentHp, maxHp);
|
||||
time = 0f;
|
||||
@@ -267,6 +274,7 @@ public class Player : MonoBehaviour
|
||||
{
|
||||
GameManager.Ins.rightHand.Show();
|
||||
playerHands.gunPent.SetActive(false);
|
||||
handState = handState.Hand;
|
||||
}
|
||||
|
||||
public void UserGun()
|
||||
@@ -274,6 +282,7 @@ public class Player : MonoBehaviour
|
||||
playerHands.gunPent.SetActive(true);
|
||||
playerHands.RefreshGun(GunId);
|
||||
GameManager.Ins.rightHand.Hide();
|
||||
handState = handState.Gun;
|
||||
}
|
||||
|
||||
#endregion
|
||||
|
||||
@@ -14,9 +14,8 @@ public class PlayerUI : MonoBehaviour
|
||||
{
|
||||
public TMP_Text timeTxt;
|
||||
public TMP_Text coinTxt;
|
||||
|
||||
[NonSerialized]
|
||||
public float second=60*15f;
|
||||
|
||||
[NonSerialized] public float second;
|
||||
|
||||
public RectTransform[] hits;
|
||||
|
||||
@@ -26,13 +25,10 @@ public class PlayerUI : MonoBehaviour
|
||||
|
||||
private int currentShowCoin;
|
||||
private Tween coinTween;
|
||||
public void Awake()
|
||||
{
|
||||
second = GameInit.Ins.gameTime;
|
||||
}
|
||||
|
||||
void Start()
|
||||
{
|
||||
second = GameInit.Ins.gameTime;
|
||||
EventDispatcher.AddEventListener<int>("PlayerHit", ShowEx);
|
||||
EventDispatcher.AddEventListener<int>("RefreshPlayerCoin", RefreshPlayerCoin);
|
||||
canvasGroup = GetComponent<CanvasGroup>();
|
||||
@@ -118,7 +114,7 @@ public class PlayerUI : MonoBehaviour
|
||||
|
||||
private void Update()
|
||||
{
|
||||
if (!GameManager.Ins.GameStart|| GameManager.Ins.isGameEnd) return;
|
||||
if (!GameManager.Ins.isGamePlay|| GameManager.Ins.isGameEnd) return;
|
||||
if (second > 0)
|
||||
{
|
||||
second = second - Time.deltaTime;
|
||||
|
||||
BIN
Assets/_FishingMaster/Textures/Shop/提示底板.png
Normal file
BIN
Assets/_FishingMaster/Textures/Shop/提示底板.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 101 KiB |
127
Assets/_FishingMaster/Textures/Shop/提示底板.png.meta
Normal file
127
Assets/_FishingMaster/Textures/Shop/提示底板.png.meta
Normal file
@@ -0,0 +1,127 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 0ed8f6c54e57041459d7b59513049950
|
||||
TextureImporter:
|
||||
internalIDToNameTable: []
|
||||
externalObjects: {}
|
||||
serializedVersion: 13
|
||||
mipmaps:
|
||||
mipMapMode: 0
|
||||
enableMipMap: 0
|
||||
sRGBTexture: 1
|
||||
linearTexture: 0
|
||||
fadeOut: 0
|
||||
borderMipMap: 0
|
||||
mipMapsPreserveCoverage: 0
|
||||
alphaTestReferenceValue: 0.5
|
||||
mipMapFadeDistanceStart: 1
|
||||
mipMapFadeDistanceEnd: 3
|
||||
bumpmap:
|
||||
convertToNormalMap: 0
|
||||
externalNormalMap: 0
|
||||
heightScale: 0.25
|
||||
normalMapFilter: 0
|
||||
flipGreenChannel: 0
|
||||
isReadable: 0
|
||||
streamingMipmaps: 0
|
||||
streamingMipmapsPriority: 0
|
||||
vTOnly: 0
|
||||
ignoreMipmapLimit: 0
|
||||
grayScaleToAlpha: 0
|
||||
generateCubemap: 6
|
||||
cubemapConvolution: 0
|
||||
seamlessCubemap: 0
|
||||
textureFormat: 1
|
||||
maxTextureSize: 2048
|
||||
textureSettings:
|
||||
serializedVersion: 2
|
||||
filterMode: 1
|
||||
aniso: 1
|
||||
mipBias: 0
|
||||
wrapU: 1
|
||||
wrapV: 1
|
||||
wrapW: 0
|
||||
nPOTScale: 0
|
||||
lightmap: 0
|
||||
compressionQuality: 50
|
||||
spriteMode: 1
|
||||
spriteExtrude: 1
|
||||
spriteMeshType: 1
|
||||
alignment: 0
|
||||
spritePivot: {x: 0.5, y: 0.5}
|
||||
spritePixelsToUnits: 100
|
||||
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
|
||||
spriteGenerateFallbackPhysicsShape: 1
|
||||
alphaUsage: 1
|
||||
alphaIsTransparency: 1
|
||||
spriteTessellationDetail: -1
|
||||
textureType: 8
|
||||
textureShape: 1
|
||||
singleChannelComponent: 0
|
||||
flipbookRows: 1
|
||||
flipbookColumns: 1
|
||||
maxTextureSizeSet: 0
|
||||
compressionQualitySet: 0
|
||||
textureFormatSet: 0
|
||||
ignorePngGamma: 0
|
||||
applyGammaDecoding: 0
|
||||
swizzle: 50462976
|
||||
cookieLightType: 0
|
||||
platformSettings:
|
||||
- serializedVersion: 3
|
||||
buildTarget: DefaultTexturePlatform
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: -1
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 0
|
||||
ignorePlatformSupport: 0
|
||||
androidETC2FallbackOverride: 0
|
||||
forceMaximumCompressionQuality_BC6H_BC7: 0
|
||||
- serializedVersion: 3
|
||||
buildTarget: Standalone
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: -1
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 0
|
||||
ignorePlatformSupport: 0
|
||||
androidETC2FallbackOverride: 0
|
||||
forceMaximumCompressionQuality_BC6H_BC7: 0
|
||||
- serializedVersion: 3
|
||||
buildTarget: Android
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: -1
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 0
|
||||
ignorePlatformSupport: 0
|
||||
androidETC2FallbackOverride: 0
|
||||
forceMaximumCompressionQuality_BC6H_BC7: 0
|
||||
spriteSheet:
|
||||
serializedVersion: 2
|
||||
sprites: []
|
||||
outline: []
|
||||
physicsShape: []
|
||||
bones: []
|
||||
spriteID: 5e97eb03825dee720800000000000000
|
||||
internalID: 0
|
||||
vertices: []
|
||||
indices:
|
||||
edges: []
|
||||
weights: []
|
||||
secondaryTextures: []
|
||||
nameFileIdTable: {}
|
||||
mipmapLimitGroupName:
|
||||
pSDRemoveMatte: 0
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
Reference in New Issue
Block a user