森罗小游戏bug修改

dev_chengFeng
ZhangBiao 2020-07-16 16:59:46 +08:00
parent afa02aae2e
commit cb56ec6b22
9 changed files with 583 additions and 78 deletions

View File

@ -114,7 +114,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 383.5, y: -3.4}
m_AnchoredPosition: {x: 174, y: 0}
m_SizeDelta: {x: 37.53, y: 48.77}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &83303293
@ -191,8 +191,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 1, y: 50.025}
m_SizeDelta: {x: 903.2, y: 900.35}
m_AnchoredPosition: {x: 1, y: 24.7}
m_SizeDelta: {x: 903.2, y: 912.4}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &144446858
GameObject:
@ -371,7 +371,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!224 &305564107
RectTransform:
m_ObjectHideFlags: 0
@ -670,7 +670,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
m_IsActive: 1
--- !u!224 &749036027
RectTransform:
m_ObjectHideFlags: 0
@ -733,7 +733,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -349.7, y: -2.7}
m_AnchoredPosition: {x: -150, y: 0}
m_SizeDelta: {x: 37.53, y: 48.77}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &809119151
@ -812,7 +812,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -224.92, y: -2.7}
m_AnchoredPosition: {x: -18.919983, y: -2.7}
m_SizeDelta: {x: 201.53, y: 48.77}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &834940287
@ -892,7 +892,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -35.2, y: -571}
m_AnchoredPosition: {x: 0, y: -571}
m_SizeDelta: {x: 164.13, y: 39.3}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &848968187
@ -1550,7 +1550,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -50.9, y: -4.1}
m_AnchoredPosition: {x: 155.10002, y: -4.1}
m_SizeDelta: {x: 135.49, y: 48.77}
m_Pivot: {x: 0.6004501, y: 0.5}
--- !u!222 &1542909634
@ -1732,7 +1732,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!224 &1615766573
RectTransform:
m_ObjectHideFlags: 0
@ -1833,7 +1833,7 @@ RectTransform:
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: -13.2, y: -581.52}
m_AnchoredPosition: {x: 4, y: -581.52}
m_SizeDelta: {x: 100, y: 65.37}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &1749343157
@ -1934,7 +1934,6 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: fcf53bbee510dca40b2f81e3c0d426c6, type: 3}
m_Name:
m_EditorClassIdentifier:
tweenSequeue1:
tweenSequeue:
- initV3: {x: 0, y: -182, z: 0}
initFloat: 0
@ -2216,7 +2215,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 127, y: -571}
m_AnchoredPosition: {x: 164, y: -571}
m_SizeDelta: {x: 164.13, y: 39.3}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1913185730
@ -2370,7 +2369,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 1}
m_AnchorMax: {x: 0.5, y: 1}
m_AnchoredPosition: {x: -2.05, y: -64.869995}
m_AnchoredPosition: {x: -2.05, y: -54}
m_SizeDelta: {x: 227.45, y: 70.46997}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &2096498370
@ -2411,7 +2410,7 @@ MonoBehaviour:
m_Alignment: 4
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 0
m_HorizontalOverflow: 1
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: "\u8BD5\u70BC\u6392\u884C"
@ -17468,7 +17467,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!224 &888866949332762560
RectTransform:
m_ObjectHideFlags: 0
@ -17970,7 +17969,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!224 &6859544939796263621
RectTransform:
m_ObjectHideFlags: 0
@ -19601,7 +19600,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!224 &5841943504906771716
RectTransform:
m_ObjectHideFlags: 0
@ -22886,7 +22885,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0.5}
m_AnchorMax: {x: 0, y: 0.5}
m_AnchoredPosition: {x: 259.98, y: 0.99999}
m_AnchoredPosition: {x: 363, y: 0.99999}
m_SizeDelta: {x: 81.335, y: 41.9}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4856250047464312066
@ -23039,7 +23038,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0.5}
m_AnchorMax: {x: 0, y: 0.5}
m_AnchoredPosition: {x: 319.9, y: 1}
m_AnchoredPosition: {x: 422.91998, y: 1}
m_SizeDelta: {x: 38.5, y: 41.9}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5482554227695650141

View File

@ -1,5 +1,79 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1 &54161720994256634
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 8034405864224889293}
- component: {fileID: 4462253337290830853}
- component: {fileID: 4316387451127118788}
m_Layer: 5
m_Name: Image
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &8034405864224889293
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 54161720994256634}
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_Children: []
m_Father: {fileID: 7515234312866947993}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: -0.5}
m_SizeDelta: {x: 0, y: 1}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4462253337290830853
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 54161720994256634}
m_CullTransparentMesh: 0
--- !u!114 &4316387451127118788
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 54161720994256634}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_Sprite: {fileID: 21300000, guid: 9e9505ff26f90b94da8e53de96720148, 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
--- !u!1 &873150957316726126
GameObject:
m_ObjectHideFlags: 0
@ -19,7 +93,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!224 &3072715633071366636
RectTransform:
m_ObjectHideFlags: 0
@ -33,12 +107,12 @@ RectTransform:
m_Children:
- {fileID: 8262274471959621314}
m_Father: {fileID: 1620471100564594411}
m_RootOrder: 3
m_RootOrder: 4
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: 317, y: 0.00000047684}
m_SizeDelta: {x: 231.1, y: 65.8}
m_AnchoredPosition: {x: 270.4, y: -45.7}
m_SizeDelta: {x: 260, y: 74}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7030412799340013248
CanvasRenderer:
@ -249,14 +323,17 @@ RectTransform:
- {fileID: 333712254359820098}
- {fileID: 1153538798003107733}
- {fileID: 4565167496659719379}
- {fileID: 7515234312866947993}
- {fileID: 3072715633071366636}
- {fileID: 8721851410157857503}
- {fileID: 6916448305812977020}
m_Father: {fileID: 9018336820421192237}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: 36.9}
m_SizeDelta: {x: 912.3, y: 173.7}
m_AnchoredPosition: {x: 1, y: 478}
m_SizeDelta: {x: 912.3, y: 230.9}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6188642493049056719
CanvasRenderer:
@ -300,7 +377,7 @@ RectTransform:
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_AnchoredPosition: {x: -0.8999939, y: 1.7999992}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &2027567171726541763
@ -333,18 +410,18 @@ MonoBehaviour:
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_FontData:
m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3}
m_FontSize: 35
m_FontSize: 42
m_FontStyle: 0
m_BestFit: 0
m_MinSize: 0
m_MaxSize: 40
m_MaxSize: 42
m_Alignment: 4
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: "\u9886 \u53D6"
m_Text: "\u524D \u5F80"
LanguageIndex: 10208
--- !u!1 &1628922710145477005
GameObject:
@ -421,6 +498,86 @@ MonoBehaviour:
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
--- !u!1 &2220087520815456173
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 3738612719059981244}
- component: {fileID: 2654396465328962117}
- component: {fileID: 3098365217884566127}
m_Layer: 5
m_Name: Text
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &3738612719059981244
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2220087520815456173}
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_Children: []
m_Father: {fileID: 8721851410157857503}
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.8999939, y: 1.7999992}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &2654396465328962117
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2220087520815456173}
m_CullTransparentMesh: 0
--- !u!114 &3098365217884566127
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2220087520815456173}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: ebfe0e44da74fbd44b1b744995de2324, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1}
m_RaycastTarget: 0
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_FontData:
m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3}
m_FontSize: 42
m_FontStyle: 0
m_BestFit: 0
m_MinSize: 0
m_MaxSize: 42
m_Alignment: 4
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: "\u9886 \u53D6"
LanguageIndex: 10208
--- !u!1 &2581917096900291814
GameObject:
m_ObjectHideFlags: 0
@ -495,6 +652,144 @@ MonoBehaviour:
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
--- !u!1 &2922305182368385196
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 8721851410157857503}
- component: {fileID: 8542242932232461925}
- component: {fileID: 36426600008126225}
- component: {fileID: 3342257233554803489}
- component: {fileID: 8739045566324571930}
m_Layer: 5
m_Name: GetBtn
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
--- !u!224 &8721851410157857503
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2922305182368385196}
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_Children:
- {fileID: 3738612719059981244}
m_Father: {fileID: 1620471100564594411}
m_RootOrder: 5
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: 269.5, y: -44.8}
m_SizeDelta: {x: 260, y: 74}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8542242932232461925
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2922305182368385196}
m_CullTransparentMesh: 0
--- !u!114 &36426600008126225
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2922305182368385196}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_Sprite: {fileID: 21300000, guid: f615ecdbbffd77f4b89afe678ee4d8d5, 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
--- !u!114 &3342257233554803489
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2922305182368385196}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 1392445389, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Navigation:
m_Mode: 3
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_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_DisabledSprite: {fileID: 0}
m_AnimationTriggers:
m_NormalTrigger: Normal
m_HighlightedTrigger: Highlighted
m_PressedTrigger: Pressed
m_DisabledTrigger: Disabled
m_Interactable: 1
m_TargetGraphic: {fileID: 36426600008126225}
m_OnClick:
m_PersistentCalls:
m_Calls: []
m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0,
Culture=neutral, PublicKeyToken=null
--- !u!95 &8739045566324571930
Animator:
serializedVersion: 3
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2922305182368385196}
m_Enabled: 1
m_Avatar: {fileID: 0}
m_Controller: {fileID: 9100000, guid: 6ffe000b5a58aac48a9d130543849d76, type: 2}
m_CullingMode: 0
m_UpdateMode: 0
m_ApplyRootMotion: 0
m_LinearVelocityBlending: 0
m_WarningMessage:
m_HasTransformHierarchy: 1
m_AllowConstantClipSamplingOptimization: 1
m_KeepAnimatorControllerStateOnDisable: 0
--- !u!1 &2932965295703609436
GameObject:
m_ObjectHideFlags: 0
@ -530,8 +825,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -186.3, y: 55}
m_SizeDelta: {x: 539.8, y: 50}
m_AnchoredPosition: {x: -219.8, y: 74}
m_SizeDelta: {x: 404.2, y: 50}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7420992205615427876
CanvasRenderer:
@ -604,8 +899,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -120, y: -28}
m_SizeDelta: {x: 632.6, y: 94.2}
m_AnchoredPosition: {x: -142, y: -45}
m_SizeDelta: {x: 554.1, y: 122.6}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5247377110869194422
CanvasRenderer:
@ -632,8 +927,8 @@ MonoBehaviour:
m_Right: 0
m_Top: 0
m_Bottom: 0
m_ChildAlignment: 4
m_Spacing: -10
m_ChildAlignment: 3
m_Spacing: 20
m_ChildForceExpandWidth: 0
m_ChildForceExpandHeight: 0
m_ChildControlWidth: 0
@ -744,10 +1039,10 @@ RectTransform:
m_Father: {fileID: 1620471100564594411}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: -39}
m_SizeDelta: {x: 0, y: 78}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &3363911727293834878
CanvasRenderer:
@ -777,7 +1072,7 @@ MonoBehaviour:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_Sprite: {fileID: 21300000, guid: 578016bcc0473ff47a2694b7d2c27b1e, type: 3}
m_Sprite: {fileID: 21300000, guid: 12e67c97119a30e409a6ef5a2bc904a2, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
@ -861,6 +1156,117 @@ MonoBehaviour:
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
--- !u!1 &5891248396180822147
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 6916448305812977020}
- component: {fileID: 690032508560006104}
- component: {fileID: 2502582822435183279}
m_Layer: 5
m_Name: mask
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
--- !u!224 &6916448305812977020
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5891248396180822147}
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_Children: []
m_Father: {fileID: 1620471100564594411}
m_RootOrder: 6
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: 270, y: -41}
m_SizeDelta: {x: 190, y: 116}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &690032508560006104
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5891248396180822147}
m_CullTransparentMesh: 0
--- !u!114 &2502582822435183279
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5891248396180822147}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_Sprite: {fileID: 21300000, guid: 199e74fa77e340c41815c9b3d3ae3d3b, 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
--- !u!1 &5954476524229089478
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 7515234312866947993}
m_Layer: 5
m_Name: line
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &7515234312866947993
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5954476524229089478}
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_Children:
- {fileID: 8034405864224889293}
- {fileID: 6401711898441506632}
m_Father: {fileID: 1620471100564594411}
m_RootOrder: 3
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!1 &6054560950975952767
GameObject:
m_ObjectHideFlags: 0
@ -938,6 +1344,80 @@ MonoBehaviour:
m_BlockingMask:
serializedVersion: 2
m_Bits: 4294967295
--- !u!1 &6090171918858670302
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 6401711898441506632}
- component: {fileID: 4400792933912760583}
- component: {fileID: 19995085868630835}
m_Layer: 5
m_Name: Image (1)
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &6401711898441506632
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6090171918858670302}
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_Children: []
m_Father: {fileID: 7515234312866947993}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: 37.449997}
m_SizeDelta: {x: 912.3, y: 1}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4400792933912760583
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6090171918858670302}
m_CullTransparentMesh: 0
--- !u!114 &19995085868630835
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6090171918858670302}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_Sprite: {fileID: 21300000, guid: 9e9505ff26f90b94da8e53de96720148, 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
--- !u!1 &6487443944815328996
GameObject:
m_ObjectHideFlags: 0
@ -999,7 +1479,6 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: fcf53bbee510dca40b2f81e3c0d426c6, type: 3}
m_Name:
m_EditorClassIdentifier:
tweenSequeue1:
tweenSequeue:
- initV3: {x: 0, y: -300, z: 0}
initFloat: 0
@ -1064,7 +1543,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: -71, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1584018400099285319
@ -1096,13 +1575,13 @@ MonoBehaviour:
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_FontData:
m_Font: {fileID: 12800000, guid: 6fa15837529b0e640af6620b07d3207d, type: 3}
m_FontSize: 30
m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3}
m_FontSize: 35
m_FontStyle: 0
m_BestFit: 0
m_MinSize: 2
m_MaxSize: 40
m_Alignment: 4
m_Alignment: 3
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 0

View File

@ -13500,10 +13500,22 @@ MonoBehaviour:
extension: .mp3
resPathIndex: 85
resAbNameIndex: 273
- resName: Audio_Effect_c_fhlh_00021_t3_attack_01
extension: .mp3
resPathIndex: 85
resAbNameIndex: 273
- resName: Audio_Effect_c_gg_0005_t3_attack_02
extension: .mp3
resPathIndex: 85
resAbNameIndex: 273
- resName: Audio_Effect_c_ghn_0009_t3_attack_02
extension: .mp3
resPathIndex: 85
resAbNameIndex: 273
- resName: Audio_Effect_c_jcdp_00027_attack_02
extension: .mp3
resPathIndex: 85
resAbNameIndex: 273
- resName: Audio_Effect_c_jmm_0006_attack_02
extension: .mp3
resPathIndex: 85
@ -13512,10 +13524,18 @@ MonoBehaviour:
extension: .mp3
resPathIndex: 85
resAbNameIndex: 273
- resName: Audio_Effect_c_jzy_00043_attack_01
extension: .mp3
resPathIndex: 85
resAbNameIndex: 273
- resName: Audio_Effect_c_kqmw_00018_attack_02
extension: .mp3
resPathIndex: 85
resAbNameIndex: 273
- resName: Audio_Effect_c_nz_00029_t3_attack_02
extension: .mp3
resPathIndex: 85
resAbNameIndex: 273
- resName: Audio_Effect_c_rd_00019_t3_attack_02
extension: .mp3
resPathIndex: 85
@ -13524,6 +13544,10 @@ MonoBehaviour:
extension: .mp3
resPathIndex: 85
resAbNameIndex: 273
- resName: Audio_Effect_c_xllh_00022_t3_attack_01
extension: .mp3
resPathIndex: 85
resAbNameIndex: 273
- resName: Audio_fx_Effect_CST_skill01
extension: .mp3
resPathIndex: 85

View File

@ -132,14 +132,16 @@ end
--- --------- 组件显示的初始化 --------------------------------------
function this.SetItemShow(panelType)
local str = ""
str = panelType == PANEL_TYPE.TRIAL_RANK and Language[10313] or Language[10314]
str = panelType == PANEL_TYPE.TRIAL_RANK and "森罗幻境排行" or Language[10314]
this.title.text = str
this.monsterTitleRoot:SetActive(true)--两个排行用的一个titleroot
this.trailRecord:SetActive(panelType == PANEL_TYPE.TRIAL_RANK)
this.trailTitleRoot:SetActive(panelType == PANEL_TYPE.TRIAL_RANK)
-- this.trailTitleRoot:SetActive(panelType == PANEL_TYPE.TRIAL_RANK)
this.scrollRoot:SetActive(panelType == PANEL_TYPE.TRIAL_RANK)
this.monsterTitleRoot:SetActive(panelType == PANEL_TYPE.MONSTER_CAMP_RANK)
-- this.monsterTitleRoot:SetActive(panelType == PANEL_TYPE.MONSTER_CAMP_RANK)
this.monsterRecord:SetActive(panelType == PANEL_TYPE.MONSTER_CAMP_RANK)
this.monsterScroll:SetActive(panelType == PANEL_TYPE.MONSTER_CAMP_RANK)
@ -318,7 +320,7 @@ function this.RefreshRankData(item, info,userRank)
local numText = Util.GetGameObject(numImg.gameObject, "Text"):GetComponent("Text")
local head = Util.GetGameObject(item, "Image/head")
local roleName = Util.GetGameObject(item, "Image/textRoot/name"):GetComponent("Text")
local roleMinTime = Util.GetGameObject(item, "Image/textRoot/passTime"):GetComponent("Text")
-- local roleMinTime = Util.GetGameObject(item, "Image/textRoot/passTime"):GetComponent("Text")
local roleMaxLevel = Util.GetGameObject(item, "Image/textRoot/maxLevel"):GetComponent("Text")
local roleRank = info.rankInfo.rank
@ -344,7 +346,7 @@ function this.RefreshRankData(item, info,userRank)
numImg.sprite = Util.LoadSprite(resPath)
numText.text = roleRank
roleName.text = info.userName
roleMinTime.text = SetTimeFormation(info.rankInfo.param2)
-- roleMinTime.text = SetTimeFormation(info.rankInfo.param2)
roleMaxLevel.text = info.rankInfo.param1
end

View File

@ -1113,7 +1113,7 @@ function this:Update()
-- CheckRedPointStatus(RedPointType.EpicExplore_OpenCarbon)
-- this.RefreshOpenText(CARBON_TYPE.TRIAL, FUNCTION_OPEN_TYPE.TRIAL)
-- FunctionOpenMananger.CleadNewText(FUNCTION_OPEN_TYPE.TRIAL)
LogBlue(Language[11163])
-- LogBlue(Language[11163])
else
PopupTipPanel.ShowTip(ActTimeCtrlManager.GetFuncTip(FUNCTION_OPEN_TYPE.TRIAL))
end

View File

@ -185,7 +185,7 @@ function this.InitTrialRewardData(gotLevelData)
this.trialRewardInfo = {}
if gotLevelData and #gotLevelData > 0 then
for i = 1, #gotLevelData do
LogPink(Language[11246] .. gotLevelData[i])
-- LogPink(Language[11246] .. gotLevelData[i])
this.trialRewardInfo[gotLevelData[i]] = gotLevelData[i]
end
end

View File

@ -58,9 +58,8 @@ end
-- 初始化界面显示
function this.InitBtnShow()
-- ctrlView.BattleEnd()
LogPink("panelType"..panelType)
if panelType == 1 then
this.bossEffect:SetActive(true)
this.bossEffect:SetActive(true)--进图显示召唤boss
this.bombRoot:SetActive(false)
-- canCallBoss = true
-- 界面打开时删除所有小怪

View File

@ -470,16 +470,6 @@ function this.EdgeEventTrigger(u, v)
this.SetCtrlState(true)
MapPlayerView.SetRoleBattleAction()
MapPlayerView.SetBattleState(true)
-- Timer.New(function ()
-- this.SetCtrlState(false)
-- -- if CarbonManager.difficulty == CARBON_TYPE.TRIAL and MapTrialManager.powerValue >= 100 then
-- -- Log("不发送请求")
-- -- else
-- triggerFunc()
-- -- end
-- end , 1):Start()
if PlayerPrefs.GetInt(var)==1 then--自动战斗是否开启
Timer.New(function ()
@ -491,6 +481,7 @@ function this.EdgeEventTrigger(u, v)
triggerFunc()
end
else
MapPlayerView.SetBattleState(true)
if PlayerPrefs.GetInt(var)==1 then--自动战斗是否开启
Timer.New(function ()
triggerFunc()

View File

@ -72,33 +72,44 @@ function this.SetScrollPre(root,data)
local info=Util.GetGameObject(root,"Title/Info"):GetComponent("Text")
local grid=Util.GetGameObject(root,"Grid")
local goBtn=Util.GetGameObject(root,"GoBtn")
local goText=Util.GetGameObject(goBtn,"Text"):GetComponent("Text")
local getBtn=Util.GetGameObject(root,"GetBtn")
local mask=Util.GetGameObject(root,"mask")
info.text=string.format( Language[11616],data.Count,MapTrialManager.GetKilCount(),data.Count)
ResetItemView(root,grid.transform,itemList,#data.BoxReward,0.8,sortingOrder,false,data.BoxReward)
ResetItemView(root,grid.transform,itemList,#data.BoxReward,0.9,sortingOrder,false,data.BoxReward)
--按钮状态
local s=MapTrialManager.GetTrialRewardState(data.Id)
goBtn:GetComponent("Button").interactable=s~=0
if s==0 then
goText.text=Language[10350]
-- goText.text=Language[10350]
mask:SetActive(true)
goBtn:SetActive(false)
getBtn:SetActive(false)
elseif s==1 then
goText.text=Language[10022]
-- goText.text=Language[10022]
mask:SetActive(false)
goBtn:SetActive(false)
getBtn:SetActive(true)
elseif s==2 then
goText.text=Language[10023]
-- goText.text=Language[10023]
mask:SetActive(false)
goBtn:SetActive(true)
getBtn:SetActive(false)
end
Util.AddOnceClick(goBtn,function()
if s==1 then
NetManager.RequestLevelReward(data.Id, function(msg)
MapTrialManager.SetTrialRewardInfo(data.Id) --本地记录已领奖励信息
UIManager.OpenPanel(UIName.RewardItemPopup,msg.drop,1,function()
this.RefreshPanel()
end)
this:ClosePanel()
end)
Util.AddOnceClick(getBtn,function()
NetManager.RequestLevelReward(data.Id, function(msg)
MapTrialManager.SetTrialRewardInfo(data.Id) --本地记录已领奖励信息
UIManager.OpenPanel(UIName.RewardItemPopup,msg.drop,1,function()
mask:SetActive(true)
getBtn:SetActive(false)
this.RefreshPanel()
end)
elseif s==2 then
this:ClosePanel()
end
end)
end)
end