Skip to content

B
BoomMaster
Commit 3e0ddf6e authored by wanqing's avatar wanqing
Browse files
Options

修改逻辑

parent 317a0dfe
Show whitespace changes
Inline Side-by-side
Showing with 180 additions and 580 deletions
BoomMaster/Assembly-CSharp.csproj
View file @ 3e0ddf6e
...@@ -179,11 +179,13 @@ ...@@ -179,11 +179,13 @@
<Compile Include="Assets\#E1_Plugins\RayFire\Tutorial\Scripts\DemolitionEventScript.cs" /> <Compile Include="Assets\#E1_Plugins\RayFire\Tutorial\Scripts\DemolitionEventScript.cs" />
<None Include="Assets\#D2_Shaders\CustomLightingToon.shader" /> <None Include="Assets\#D2_Shaders\CustomLightingToon.shader" />
<None Include="Assets\#D2_Shaders\Shader\Dissolve.shader" /> <None Include="Assets\#D2_Shaders\Shader\Dissolve.shader" />
<None Include="Assets\#D2_Shaders\Planet.shader" />
<None Include="Assets\#D2_Shaders\RimShader.shader" /> <None Include="Assets\#D2_Shaders\RimShader.shader" />
<None Include="Assets\#D2_Shaders\AlphaRimPro.shader" /> <None Include="Assets\#D2_Shaders\AlphaRimPro.shader" />
<None Include="Assets\#D2_Shaders\ShaderFX.shader" /> <None Include="Assets\#D2_Shaders\ShaderFX.shader" />
<None Include="Assets\#D2_Shaders\OutLine1.shader" /> <None Include="Assets\#D2_Shaders\OutLine1.shader" />
<None Include="Assets\#D2_Shaders\Water.shader" /> <None Include="Assets\#D2_Shaders\Water.shader" />
<None Include="Assets\#D2_Shaders\LightShader.shader" />
<None Include="Assets\#D2_Shaders\Shader\AlphaRimBase.shader" /> <None Include="Assets\#D2_Shaders\Shader\AlphaRimBase.shader" />
<None Include="Assets\#A2_Scripts\项目文件说明文档.txt" /> <None Include="Assets\#A2_Scripts\项目文件说明文档.txt" />
<None Include="Assets\#D2_Shaders\BlockTextrue.shader" /> <None Include="Assets\#D2_Shaders\BlockTextrue.shader" />
......
BoomMaster/Assets/#A1_Scenes/DemoScenes.unity
View file @ 3e0ddf6e
...@@ -38,7 +38,7 @@ RenderSettings: ...@@ -38,7 +38,7 @@ RenderSettings:
m_ReflectionIntensity: 1 m_ReflectionIntensity: 1
m_CustomReflection: {fileID: 0} m_CustomReflection: {fileID: 0}
m_Sun: {fileID: 0} m_Sun: {fileID: 0}
m_IndirectSpecularColor: {r: 0.37311992, g: 0.38074034, b: 0.35872713, a: 1} m_IndirectSpecularColor: {r: 0.37311926, g: 0.38073996, b: 0.35872698, a: 1}
m_UseRadianceAmbientProbe: 0 m_UseRadianceAmbientProbe: 0
--- !u!157 &4 --- !u!157 &4
LightmapSettings: LightmapSettings:
...@@ -365,241 +365,6 @@ PrefabInstance: ...@@ -365,241 +365,6 @@ PrefabInstance:
m_Modification: m_Modification:
m_TransformParent: {fileID: 0} m_TransformParent: {fileID: 0}
m_Modifications: m_Modifications:
- target: {fileID: 149752314123208833, guid: 919382978f5e2684ba83e6daf6491458,
type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 149752314123208833, guid: 919382978f5e2684ba83e6daf6491458,
type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 149752314123208833, guid: 919382978f5e2684ba83e6daf6491458,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 149752314123208833, guid: 919382978f5e2684ba83e6daf6491458,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 781047637346676936, guid: 919382978f5e2684ba83e6daf6491458,
type: 3}
propertyPath: m_TargetGraphic
value:
objectReference: {fileID: 2551918300351401872}
- target: {fileID: 2121116615656044019, guid: 919382978f5e2684ba83e6daf6491458,
type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2121116615656044019, guid: 919382978f5e2684ba83e6daf6491458,
type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2121116615656044019, guid: 919382978f5e2684ba83e6daf6491458,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2121116615656044019, guid: 919382978f5e2684ba83e6daf6491458,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4752653425415952349, guid: 919382978f5e2684ba83e6daf6491458,
type: 3}
propertyPath: m_TargetGraphic
value:
objectReference: {fileID: 2551918300351401874}
- target: {fileID: 5882450331430651428, guid: 919382978f5e2684ba83e6daf6491458,
type: 3}
propertyPath: m_TargetGraphic
value:
objectReference: {fileID: 2551918300351401873}
- target: {fileID: 6064464676490241252, guid: 919382978f5e2684ba83e6daf6491458,
type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6064464676490241252, guid: 919382978f5e2684ba83e6daf6491458,
type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6064464676490241252, guid: 919382978f5e2684ba83e6daf6491458,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6064464676490241252, guid: 919382978f5e2684ba83e6daf6491458,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6064464676490241252, guid: 919382978f5e2684ba83e6daf6491458,
type: 3}
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6064464676490241252, guid: 919382978f5e2684ba83e6daf6491458,
type: 3}
propertyPath: m_SizeDelta.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6064464676512695453, guid: 919382978f5e2684ba83e6daf6491458,
type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6064464676512695453, guid: 919382978f5e2684ba83e6daf6491458,
type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6064464676512695453, guid: 919382978f5e2684ba83e6daf6491458,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6064464676512695453, guid: 919382978f5e2684ba83e6daf6491458,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6064464676512695453, guid: 919382978f5e2684ba83e6daf6491458,
type: 3}
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6064464676512695453, guid: 919382978f5e2684ba83e6daf6491458,
type: 3}
propertyPath: m_SizeDelta.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6064464676796766616, guid: 919382978f5e2684ba83e6daf6491458,
type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6064464676796766616, guid: 919382978f5e2684ba83e6daf6491458,
type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6064464676796766616, guid: 919382978f5e2684ba83e6daf6491458,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6064464676796766616, guid: 919382978f5e2684ba83e6daf6491458,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6064464676796766616, guid: 919382978f5e2684ba83e6daf6491458,
type: 3}
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6064464676796766616, guid: 919382978f5e2684ba83e6daf6491458,
type: 3}
propertyPath: m_SizeDelta.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6064464677159922113, guid: 919382978f5e2684ba83e6daf6491458,
type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6064464677159922113, guid: 919382978f5e2684ba83e6daf6491458,
type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6064464677159922113, guid: 919382978f5e2684ba83e6daf6491458,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6064464677159922113, guid: 919382978f5e2684ba83e6daf6491458,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6064464677159922113, guid: 919382978f5e2684ba83e6daf6491458,
type: 3}
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6064464677159922113, guid: 919382978f5e2684ba83e6daf6491458,
type: 3}
propertyPath: m_SizeDelta.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6064464677418123801, guid: 919382978f5e2684ba83e6daf6491458,
type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6064464677418123801, guid: 919382978f5e2684ba83e6daf6491458,
type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6064464677418123801, guid: 919382978f5e2684ba83e6daf6491458,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6064464677418123801, guid: 919382978f5e2684ba83e6daf6491458,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6064464677418123801, guid: 919382978f5e2684ba83e6daf6491458,
type: 3}
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6064464677418123801, guid: 919382978f5e2684ba83e6daf6491458,
type: 3}
propertyPath: m_SizeDelta.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6064464677571250786, guid: 919382978f5e2684ba83e6daf6491458,
type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6064464677571250786, guid: 919382978f5e2684ba83e6daf6491458,
type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6064464677571250786, guid: 919382978f5e2684ba83e6daf6491458,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6064464677571250786, guid: 919382978f5e2684ba83e6daf6491458,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6064464677571250786, guid: 919382978f5e2684ba83e6daf6491458,
type: 3}
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6064464677571250786, guid: 919382978f5e2684ba83e6daf6491458,
type: 3}
propertyPath: m_SizeDelta.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6064464677632144689, guid: 919382978f5e2684ba83e6daf6491458, - target: {fileID: 6064464677632144689, guid: 919382978f5e2684ba83e6daf6491458,
type: 3} type: 3}
propertyPath: m_Name propertyPath: m_Name
...@@ -710,244 +475,8 @@ PrefabInstance: ...@@ -710,244 +475,8 @@ PrefabInstance:
propertyPath: m_Pivot.y propertyPath: m_Pivot.y
value: 0 value: 0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 6064464677866441004, guid: 919382978f5e2684ba83e6daf6491458,
type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6064464677866441004, guid: 919382978f5e2684ba83e6daf6491458,
type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6064464677866441004, guid: 919382978f5e2684ba83e6daf6491458,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6064464677866441004, guid: 919382978f5e2684ba83e6daf6491458,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6064464677866441004, guid: 919382978f5e2684ba83e6daf6491458,
type: 3}
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6064464677866441004, guid: 919382978f5e2684ba83e6daf6491458,
type: 3}
propertyPath: m_SizeDelta.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6064464677995419505, guid: 919382978f5e2684ba83e6daf6491458,
type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6064464677995419505, guid: 919382978f5e2684ba83e6daf6491458,
type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6064464677995419505, guid: 919382978f5e2684ba83e6daf6491458,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6064464677995419505, guid: 919382978f5e2684ba83e6daf6491458,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6064464677995419505, guid: 919382978f5e2684ba83e6daf6491458,
type: 3}
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6064464677995419505, guid: 919382978f5e2684ba83e6daf6491458,
type: 3}
propertyPath: m_SizeDelta.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6064464678113377477, guid: 919382978f5e2684ba83e6daf6491458,
type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6064464678113377477, guid: 919382978f5e2684ba83e6daf6491458,
type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6064464678113377477, guid: 919382978f5e2684ba83e6daf6491458,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6064464678113377477, guid: 919382978f5e2684ba83e6daf6491458,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6064464678113377477, guid: 919382978f5e2684ba83e6daf6491458,
type: 3}
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6064464678113377477, guid: 919382978f5e2684ba83e6daf6491458,
type: 3}
propertyPath: m_SizeDelta.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6064464678311815746, guid: 919382978f5e2684ba83e6daf6491458,
type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6064464678311815746, guid: 919382978f5e2684ba83e6daf6491458,
type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6064464678311815746, guid: 919382978f5e2684ba83e6daf6491458,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6064464678311815746, guid: 919382978f5e2684ba83e6daf6491458,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6064464678311815746, guid: 919382978f5e2684ba83e6daf6491458,
type: 3}
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6064464678311815746, guid: 919382978f5e2684ba83e6daf6491458,
type: 3}
propertyPath: m_SizeDelta.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6064464678319559023, guid: 919382978f5e2684ba83e6daf6491458,
type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6064464678319559023, guid: 919382978f5e2684ba83e6daf6491458,
type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6064464678319559023, guid: 919382978f5e2684ba83e6daf6491458,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6064464678319559023, guid: 919382978f5e2684ba83e6daf6491458,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6064464678319559023, guid: 919382978f5e2684ba83e6daf6491458,
type: 3}
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6064464678319559023, guid: 919382978f5e2684ba83e6daf6491458,
type: 3}
propertyPath: m_SizeDelta.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6064464678379903268, guid: 919382978f5e2684ba83e6daf6491458,
type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6064464678379903268, guid: 919382978f5e2684ba83e6daf6491458,
type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6064464678379903268, guid: 919382978f5e2684ba83e6daf6491458,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6064464678379903268, guid: 919382978f5e2684ba83e6daf6491458,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6064464678379903268, guid: 919382978f5e2684ba83e6daf6491458,
type: 3}
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6064464678379903268, guid: 919382978f5e2684ba83e6daf6491458,
type: 3}
propertyPath: m_SizeDelta.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6577432729053575209, guid: 919382978f5e2684ba83e6daf6491458,
type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6577432729053575209, guid: 919382978f5e2684ba83e6daf6491458,
type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6577432729053575209, guid: 919382978f5e2684ba83e6daf6491458,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6577432729053575209, guid: 919382978f5e2684ba83e6daf6491458,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: [] m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 919382978f5e2684ba83e6daf6491458, type: 3} m_SourcePrefab: {fileID: 100100000, guid: 919382978f5e2684ba83e6daf6491458, type: 3}
--- !u!114 &2551918300351401872 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 178034769468198435, guid: 919382978f5e2684ba83e6daf6491458,
type: 3}
m_PrefabInstance: {fileID: 2551918300351401871}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!114 &2551918300351401873 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 2812700684972542438, guid: 919382978f5e2684ba83e6daf6491458,
type: 3}
m_PrefabInstance: {fileID: 2551918300351401871}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!114 &2551918300351401874 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 1843624255784862802, guid: 919382978f5e2684ba83e6daf6491458,
type: 3}
m_PrefabInstance: {fileID: 2551918300351401871}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!114 &6833933616594028096 stripped --- !u!114 &6833933616594028096 stripped
MonoBehaviour: MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 6064464677632144694, guid: 919382978f5e2684ba83e6daf6491458, m_CorrespondingSourceObject: {fileID: 6064464677632144694, guid: 919382978f5e2684ba83e6daf6491458,
......
BoomMaster/Assets/#A2_Scripts/Battle/UI/BattleUI.cs
View file @ 3e0ddf6e
...@@ -337,14 +337,18 @@ public class BattleUI : MonoBehaviour ...@@ -337,14 +337,18 @@ public class BattleUI : MonoBehaviour
{ {
m_clawMoveSpeed.text = string.Format("系数越小，越快\n{0:f3}", GameServices.configService.playerConfig.ClawMoveSpeed); m_clawMoveSpeed.text = string.Format("系数越小，越快\n{0:f3}", GameServices.configService.playerConfig.ClawMoveSpeed);
}); });
if(!m_bIsGameStart) //if(!m_bIsGameStart)
{ //{
m_bIsGameStart = true; // m_bIsGameStart = true;
} //}
else //else
//{
// m_propSelectUi.gameObject.SetActive(true);
// BattleCtrl.instance.SelectPropState = true;
//}
if(m_propSelectUi)
{ {
m_propSelectUi.gameObject.SetActive(true); m_propSelectUi.Show();
BattleCtrl.instance.SelectPropState = true;
} }
} }
//设置战斗UI状态 //设置战斗UI状态
...@@ -391,21 +395,25 @@ public class BattleUI : MonoBehaviour ...@@ -391,21 +395,25 @@ public class BattleUI : MonoBehaviour
//m_boomUIS[m_bombIndex].SetActive(false); //m_boomUIS[m_bombIndex].SetActive(false);
m_bombIndex++; m_bombIndex++;
m_leftBombNum.text = string.Format("X{0:d}", 3 - m_bombIndex); m_leftBombNum.text = string.Format("X{0:d}", 3 - m_bombIndex);
if(m_isBombDouble) //if(m_isBombDouble)
{ //{
Invoke("OnClickBoomBtn", 3.4f); // Invoke("OnClickBoomBtn", 3.4f);
} //}
else //else
//{
// Invoke("OnClickBoomBtn", 1.5f);
//}
if(!m_isBombDouble)
{ {
Invoke("OnClickBoomBtn", 1.5f); BattleCtrl.instance.levelManager.curLevel.bombView.PlayBombAni();
} }
} }
void CancelBomb() void CancelBomb()
{ {
if(IsInvoking("OnClickBoomBtn")) //if(IsInvoking("OnClickBoomBtn"))
{ //{
CancelInvoke("OnClickBoomBtn"); // CancelInvoke("OnClickBoomBtn");
} //}
} }
//点击爆破按钮 //点击爆破按钮
......
BoomMaster/Assets/#A2_Scripts/Battle/UI/PropSelectUI.cs
View file @ 3e0ddf6e
...@@ -10,7 +10,7 @@ public class PropSelectUI : MonoBehaviour ...@@ -10,7 +10,7 @@ public class PropSelectUI : MonoBehaviour
public GameObject m_strengthSymbolObj; public GameObject m_strengthSymbolObj;
public GameObject m_doubleSymbolObj; public GameObject m_doubleSymbolObj;
public GameObject m_coinSymbolObj; public GameObject m_coinSymbolObj;
private void OnEnable() public void Show()
{ {
int varCoin = LocalRecord.GetIntRecord(GlobalConfig.CoinReCordKey); int varCoin = LocalRecord.GetIntRecord(GlobalConfig.CoinReCordKey);
m_strengthObj.SetActive(varCoin >= 10); m_strengthObj.SetActive(varCoin >= 10);
......
BoomMaster/Assets/#A2_Scripts/Battle/View/BombStateView.cs
View file @ 3e0ddf6e
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
using System.Collections.Generic; using System.Collections.Generic;
using UnityEngine; using UnityEngine;
using RayFire; using RayFire;
using DG.Tweening;
public class BombStateView : MonoBehaviour public class BombStateView : MonoBehaviour
{ {
...@@ -23,11 +24,75 @@ public class BombStateView : MonoBehaviour ...@@ -23,11 +24,75 @@ public class BombStateView : MonoBehaviour
private GameObject m_secondBombEffect; private GameObject m_secondBombEffect;
private Vector3 m_firstBombPos; private Vector3 m_firstBombPos;
private Vector3 m_secondBombPos; private Vector3 m_secondBombPos;
private Sequence m_sqFirst;
private void Awake() private void Awake()
{ {
m_unrealParent = m_unrealBombState1Obj.transform.parent; m_unrealParent = m_unrealBombState1Obj.transform.parent;
m_strengthUnrealParent = m_strengthUnrealBombState1Obj.transform.parent; m_strengthUnrealParent = m_strengthUnrealBombState1Obj.transform.parent;
} }
//爆破动画效果
public void PlayBombAni()
{
if (BattleCtrl.instance.battleUI.IsBombStrength)
{
if (BattleCtrl.instance.battleUI.IsBombDouble)
{
m_sqFirst = DOTween.Sequence();
m_sqFirst.Append(m_strengthRealBombObj.transform.DOScale(Vector3.one * 0.8f, 0.5f));
m_sqFirst.Join(m_strengthUnrealParent.DOScale(Vector3.one * 0.8f, 0.5f));
m_sqFirst.Append(m_strengthRealBombObj.transform.DOScale(Vector3.one * 1.2f, 0.5f));
m_sqFirst.Join(m_strengthUnrealParent.DOScale(Vector3.one * 1.2f, 0.5f));
m_sqFirst.Append(m_strengthRealBombObj.transform.DOScale(Vector3.one * 0.25f, 0.25f));
m_sqFirst.Join(m_strengthUnrealParent.DOScale(Vector3.one * 0.25f, 0.25f));
m_sqFirst.Append(m_strengthRealBombObj.transform.DOScale(Vector3.one * 2.0f, 0.25f));
m_sqFirst.Join(m_strengthUnrealParent.DOScale(Vector3.one * 2.0f, 0.25f));
m_sqFirst.AppendCallback(delegate() { BattleCtrl.instance.battleUI.OnClickBoomBtn(); });
}
else
{
m_sqFirst = DOTween.Sequence();
m_sqFirst.Append(m_strengthRealBombObj.transform.DOScale(Vector3.one * 0.8f, 0.5f));
m_sqFirst.Append(m_strengthRealBombObj.transform.DOScale(Vector3.one * 1.2f, 0.5f));
m_sqFirst.Append(m_strengthRealBombObj.transform.DOScale(Vector3.one * 0.25f, 0.25f));
m_sqFirst.Append(m_strengthRealBombObj.transform.DOScale(Vector3.one * 2.0f, 0.25f));
m_sqFirst.AppendCallback(delegate () { BattleCtrl.instance.battleUI.OnClickBoomBtn(); });
}
}
else
{
if (BattleCtrl.instance.battleUI.IsBombDouble)
{
m_sqFirst = DOTween.Sequence();
m_sqFirst.Append(m_realBombObj.transform.DOScale(Vector3.one * 0.8f, 0.5f));
m_sqFirst.Join(m_unrealParent.transform.DOScale(Vector3.one * 0.8f, 0.5f));
m_sqFirst.Append(m_realBombObj.transform.DOScale(Vector3.one * 1.2f, 0.5f));
m_sqFirst.Join(m_unrealParent.transform.DOScale(Vector3.one * 1.2f, 0.5f));
m_sqFirst.Append(m_realBombObj.transform.DOScale(Vector3.one * 0.25f, 0.25f));
m_sqFirst.Join(m_unrealParent.transform.DOScale(Vector3.one * 0.25f, 0.25f));
m_sqFirst.Append(m_realBombObj.transform.DOScale(Vector3.one * 2.0f, 0.25f));
m_sqFirst.Join(m_unrealParent.transform.DOScale(Vector3.one * 2.0f, 0.25f));
m_sqFirst.AppendCallback(delegate () { BattleCtrl.instance.battleUI.OnClickBoomBtn(); });
}
else
{
m_sqFirst = DOTween.Sequence();
m_sqFirst.Append(m_realBombObj.transform.DOScale(Vector3.one * 0.8f, 0.5f));
m_sqFirst.Append(m_realBombObj.transform.DOScale(Vector3.one * 1.2f, 0.5f));
m_sqFirst.Append(m_realBombObj.transform.DOScale(Vector3.one * 0.25f, 0.25f));
m_sqFirst.Append(m_realBombObj.transform.DOScale(Vector3.one * 2.0f, 0.25f));
m_sqFirst.AppendCallback(delegate () { BattleCtrl.instance.battleUI.OnClickBoomBtn(); });
}
}
}
//开始爆破 //开始爆破
public void StartBomb() public void StartBomb()
{ {
...@@ -162,6 +227,8 @@ public class BombStateView : MonoBehaviour ...@@ -162,6 +227,8 @@ public class BombStateView : MonoBehaviour
m_unrealBombState1Obj.SetActive(false); m_unrealBombState1Obj.SetActive(false);
m_unrealBombState3Obj.SetActive(true); m_unrealBombState3Obj.SetActive(true);
} }
ClearInvoke();
PlayBombAni();
} }
} }
//设置虚拟模型位置 //设置虚拟模型位置
...@@ -191,6 +258,11 @@ public class BombStateView : MonoBehaviour ...@@ -191,6 +258,11 @@ public class BombStateView : MonoBehaviour
m_strengthUnrealBombState2MeshRender.material.SetFloat(m_shaderFloatStr, 1.0f); m_strengthUnrealBombState2MeshRender.material.SetFloat(m_shaderFloatStr, 1.0f);
m_strengthUnrealBombState3Obj.SetActive(false); m_strengthUnrealBombState3Obj.SetActive(false);
m_shaderFloatValue = 0.0f; m_shaderFloatValue = 0.0f;
m_strengthRealBombObj.transform.localScale = Vector3.one;
m_strengthUnrealParent.localScale = Vector3.one;
m_realBombObj.transform.localScale = Vector3.one;
m_unrealParent.localScale = Vector3.one;
m_sqFirst.Kill();
ClearInvoke(); ClearInvoke();
} }
//清除invoke //清除invoke
......
BoomMaster/Assets/#A2_Scripts/Battle/View/BombView.cs
View file @ 3e0ddf6e
...@@ -93,6 +93,14 @@ public class BombView : MonoBehaviour ...@@ -93,6 +93,14 @@ public class BombView : MonoBehaviour
//} //}
//m_bCanBePlace = false; //m_bCanBePlace = false;
} }
//播放动画
public void PlayBombAni()
{
if(m_bombStateView)
{
m_bombStateView.PlayBombAni();
}
}
//画线 //画线
void DrawLine() void DrawLine()
{ {
...@@ -183,7 +191,7 @@ public class BombView : MonoBehaviour ...@@ -183,7 +191,7 @@ public class BombView : MonoBehaviour
private void Update() private void Update()
{ {
if (!BattleCtrl.instance.isStartBattle || BattleCtrl.instance.isEndBattle if (!BattleCtrl.instance.isStartBattle || BattleCtrl.instance.isEndBattle
|| BattleCtrl.instance.SelectPropState) /*|| BattleCtrl.instance.SelectPropState*/)
{ {
return; return;
} }
......
BoomMaster/Assets/#A3_Prefabs/BattleUI.prefab
View file @ 3e0ddf6e
...@@ -2629,7 +2629,7 @@ MonoBehaviour: ...@@ -2629,7 +2629,7 @@ MonoBehaviour:
m_OnClick: m_OnClick:
m_PersistentCalls: m_PersistentCalls:
m_Calls: m_Calls:
- m_Target: {fileID: 3757098214480144579} - m_Target: {fileID: 0}
m_MethodName: OnClickStrength m_MethodName: OnClickStrength
m_Mode: 1 m_Mode: 1
m_Arguments: m_Arguments:
...@@ -6045,9 +6045,9 @@ RectTransform: ...@@ -6045,9 +6045,9 @@ RectTransform:
m_Father: {fileID: 3224150048087170558} m_Father: {fileID: 3224150048087170558}
m_RootOrder: 2 m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1} m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 720, y: -130} m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 240, y: 260} m_SizeDelta: {x: 240, y: 260}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8081977683857758243 --- !u!222 &8081977683857758243
...@@ -6130,8 +6130,8 @@ MonoBehaviour: ...@@ -6130,8 +6130,8 @@ MonoBehaviour:
m_OnClick: m_OnClick:
m_PersistentCalls: m_PersistentCalls:
m_Calls: m_Calls:
- m_Target: {fileID: 3757098214480144579} - m_Target: {fileID: 8857377566680284191}
m_MethodName: OnClickStrength m_MethodName: OnClickCoin
m_Mode: 1 m_Mode: 1
m_Arguments: m_Arguments:
m_ObjectArgument: {fileID: 0} m_ObjectArgument: {fileID: 0}
...@@ -10465,10 +10465,10 @@ RectTransform: ...@@ -10465,10 +10465,10 @@ RectTransform:
m_Father: {fileID: 6064464677034440146} m_Father: {fileID: 6064464677034440146}
m_RootOrder: 8 m_RootOrder: 8
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1} m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 725, y: -725} m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 250, y: 250} m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6064464676490241254 --- !u!222 &6064464676490241254
CanvasRenderer: CanvasRenderer:
...@@ -10542,10 +10542,10 @@ RectTransform: ...@@ -10542,10 +10542,10 @@ RectTransform:
m_Father: {fileID: 6064464677034440146} m_Father: {fileID: 6064464677034440146}
m_RootOrder: 7 m_RootOrder: 7
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1} m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 425, y: -725} m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 250, y: 250} m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6064464676512695455 --- !u!222 &6064464676512695455
CanvasRenderer: CanvasRenderer:
...@@ -10813,10 +10813,10 @@ RectTransform: ...@@ -10813,10 +10813,10 @@ RectTransform:
m_Father: {fileID: 6064464677034440146} m_Father: {fileID: 6064464677034440146}
m_RootOrder: 11 m_RootOrder: 11
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1} m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 725, y: -1025} m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 250, y: 250} m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6064464676796766618 --- !u!222 &6064464676796766618
CanvasRenderer: CanvasRenderer:
...@@ -10873,7 +10873,7 @@ GameObject: ...@@ -10873,7 +10873,7 @@ GameObject:
m_Icon: {fileID: 0} m_Icon: {fileID: 0}
m_NavMeshLayer: 0 m_NavMeshLayer: 0
m_StaticEditorFlags: 0 m_StaticEditorFlags: 0
m_IsActive: 0 m_IsActive: 1
--- !u!224 &6064464676810081132 --- !u!224 &6064464676810081132
RectTransform: RectTransform:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
...@@ -11384,10 +11384,10 @@ RectTransform: ...@@ -11384,10 +11384,10 @@ RectTransform:
m_Father: {fileID: 6064464677034440146} m_Father: {fileID: 6064464677034440146}
m_RootOrder: 2 m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1} m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 725, y: -125} m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 250, y: 250} m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6064464677159922115 --- !u!222 &6064464677159922115
CanvasRenderer: CanvasRenderer:
...@@ -11715,10 +11715,10 @@ RectTransform: ...@@ -11715,10 +11715,10 @@ RectTransform:
m_Father: {fileID: 6064464677034440146} m_Father: {fileID: 6064464677034440146}
m_RootOrder: 3 m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1} m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 125, y: -425} m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 250, y: 250} m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6064464677418123803 --- !u!222 &6064464677418123803
CanvasRenderer: CanvasRenderer:
...@@ -11981,10 +11981,10 @@ RectTransform: ...@@ -11981,10 +11981,10 @@ RectTransform:
m_Father: {fileID: 6064464677034440146} m_Father: {fileID: 6064464677034440146}
m_RootOrder: 5 m_RootOrder: 5
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1} m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 725, y: -425} m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 250, y: 250} m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6064464677571250788 --- !u!222 &6064464677571250788
CanvasRenderer: CanvasRenderer:
...@@ -12261,7 +12261,7 @@ MonoBehaviour: ...@@ -12261,7 +12261,7 @@ MonoBehaviour:
- {fileID: 988923566153165421} - {fileID: 988923566153165421}
- {fileID: 2204141827806908431} - {fileID: 2204141827806908431}
- {fileID: 6895604516909073123} - {fileID: 6895604516909073123}
m_propSelectUi: {fileID: 3757098214480144579} m_propSelectUi: {fileID: 8857377566680284191}
m_totalCoinText: {fileID: 4432370447532506374} m_totalCoinText: {fileID: 4432370447532506374}
m_levelCoinText: {fileID: 9138730000298011190} m_levelCoinText: {fileID: 9138730000298011190}
m_normalBombIcon: {fileID: 7606412808718544815} m_normalBombIcon: {fileID: 7606412808718544815}
...@@ -12336,7 +12336,7 @@ Animator: ...@@ -12336,7 +12336,7 @@ Animator:
m_GameObject: {fileID: 6064464677660112694} m_GameObject: {fileID: 6064464677660112694}
m_Enabled: 1 m_Enabled: 1
m_Avatar: {fileID: 0} m_Avatar: {fileID: 0}
m_Controller: {fileID: 0} m_Controller: {fileID: 9100000, guid: bb389cc2efde9ef4ba6b88a34ad44400, type: 2}
m_CullingMode: 0 m_CullingMode: 0
m_UpdateMode: 0 m_UpdateMode: 0
m_ApplyRootMotion: 0 m_ApplyRootMotion: 0
...@@ -12501,10 +12501,10 @@ RectTransform: ...@@ -12501,10 +12501,10 @@ RectTransform:
m_Father: {fileID: 6064464677034440146} m_Father: {fileID: 6064464677034440146}
m_RootOrder: 6 m_RootOrder: 6
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1} m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 125, y: -725} m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 250, y: 250} m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6064464677866441006 --- !u!222 &6064464677866441006
CanvasRenderer: CanvasRenderer:
...@@ -12648,10 +12648,10 @@ RectTransform: ...@@ -12648,10 +12648,10 @@ RectTransform:
m_Father: {fileID: 6064464677034440146} m_Father: {fileID: 6064464677034440146}
m_RootOrder: 4 m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1} m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 425, y: -425} m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 250, y: 250} m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6064464677995419507 --- !u!222 &6064464677995419507
CanvasRenderer: CanvasRenderer:
...@@ -12795,10 +12795,10 @@ RectTransform: ...@@ -12795,10 +12795,10 @@ RectTransform:
m_Father: {fileID: 6064464677034440146} m_Father: {fileID: 6064464677034440146}
m_RootOrder: 1 m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1} m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 425, y: -125} m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 250, y: 250} m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6064464678113377479 --- !u!222 &6064464678113377479
CanvasRenderer: CanvasRenderer:
...@@ -12942,10 +12942,10 @@ RectTransform: ...@@ -12942,10 +12942,10 @@ RectTransform:
m_Father: {fileID: 6064464677034440146} m_Father: {fileID: 6064464677034440146}
m_RootOrder: 0 m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1} m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 125, y: -125} m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 250, y: 250} m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6064464678311815748 --- !u!222 &6064464678311815748
CanvasRenderer: CanvasRenderer:
...@@ -13087,10 +13087,10 @@ RectTransform: ...@@ -13087,10 +13087,10 @@ RectTransform:
m_Father: {fileID: 6064464677034440146} m_Father: {fileID: 6064464677034440146}
m_RootOrder: 9 m_RootOrder: 9
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1} m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 125, y: -1025} m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 250, y: 250} m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6064464678319558993 --- !u!222 &6064464678319558993
CanvasRenderer: CanvasRenderer:
...@@ -13216,10 +13216,10 @@ RectTransform: ...@@ -13216,10 +13216,10 @@ RectTransform:
m_Father: {fileID: 6064464677034440146} m_Father: {fileID: 6064464677034440146}
m_RootOrder: 10 m_RootOrder: 10
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1} m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 425, y: -1025} m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 250, y: 250} m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6064464678379903270 --- !u!222 &6064464678379903270
CanvasRenderer: CanvasRenderer:
...@@ -13434,9 +13434,9 @@ RectTransform: ...@@ -13434,9 +13434,9 @@ RectTransform:
m_Father: {fileID: 3224150048087170558} m_Father: {fileID: 3224150048087170558}
m_RootOrder: 1 m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1} m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 430, y: -130} m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 240, y: 260} m_SizeDelta: {x: 240, y: 260}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8761736939960799828 --- !u!222 &8761736939960799828
...@@ -13519,8 +13519,8 @@ MonoBehaviour: ...@@ -13519,8 +13519,8 @@ MonoBehaviour:
m_OnClick: m_OnClick:
m_PersistentCalls: m_PersistentCalls:
m_Calls: m_Calls:
- m_Target: {fileID: 3757098214480144579} - m_Target: {fileID: 8857377566680284191}
m_MethodName: OnClickStrength m_MethodName: OnClickDouble
m_Mode: 1 m_Mode: 1
m_Arguments: m_Arguments:
m_ObjectArgument: {fileID: 0} m_ObjectArgument: {fileID: 0}
...@@ -18151,7 +18151,7 @@ MonoBehaviour: ...@@ -18151,7 +18151,7 @@ MonoBehaviour:
m_OnClick: m_OnClick:
m_PersistentCalls: m_PersistentCalls:
m_Calls: m_Calls:
- m_Target: {fileID: 3757098214480144579} - m_Target: {fileID: 0}
m_MethodName: OnClickStart m_MethodName: OnClickStart
m_Mode: 1 m_Mode: 1
m_Arguments: m_Arguments:
...@@ -18249,7 +18249,6 @@ GameObject: ...@@ -18249,7 +18249,6 @@ GameObject:
serializedVersion: 6 serializedVersion: 6
m_Component: m_Component:
- component: {fileID: 7371021938405989799} - component: {fileID: 7371021938405989799}
- component: {fileID: 3757098214480144579}
m_Layer: 5 m_Layer: 5
m_Name: "\u589E\u5F3AUI" m_Name: "\u589E\u5F3AUI"
m_TagString: Untagged m_TagString: Untagged
...@@ -18279,24 +18278,6 @@ RectTransform: ...@@ -18279,24 +18278,6 @@ RectTransform:
m_AnchoredPosition: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &3757098214480144579
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7718438021150459873}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 28324f3cb4ba5e84380ca488eddcc61f, type: 3}
m_Name:
m_EditorClassIdentifier:
m_strengthObj: {fileID: 935220169814444094}
m_doubleObj: {fileID: 7970116045404573728}
m_coinObj: {fileID: 8702548051435287562}
m_strengthSymbolObj: {fileID: 2810314833097530004}
m_doubleSymbolObj: {fileID: 5021344926088393427}
m_coinSymbolObj: {fileID: 859530928958322986}
--- !u!1 &7742550580712339105 --- !u!1 &7742550580712339105
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
...@@ -18335,9 +18316,9 @@ RectTransform: ...@@ -18335,9 +18316,9 @@ RectTransform:
m_Father: {fileID: 3224150048087170558} m_Father: {fileID: 3224150048087170558}
m_RootOrder: 0 m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1} m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 140, y: -130} m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 240, y: 260} m_SizeDelta: {x: 240, y: 260}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1215505618301375535 --- !u!222 &1215505618301375535
...@@ -18420,7 +18401,7 @@ MonoBehaviour: ...@@ -18420,7 +18401,7 @@ MonoBehaviour:
m_OnClick: m_OnClick:
m_PersistentCalls: m_PersistentCalls:
m_Calls: m_Calls:
- m_Target: {fileID: 3757098214480144579} - m_Target: {fileID: 8857377566680284191}
m_MethodName: OnClickStrength m_MethodName: OnClickStrength
m_Mode: 1 m_Mode: 1
m_Arguments: m_Arguments:
...@@ -18849,7 +18830,7 @@ MonoBehaviour: ...@@ -18849,7 +18830,7 @@ MonoBehaviour:
m_OnClick: m_OnClick:
m_PersistentCalls: m_PersistentCalls:
m_Calls: m_Calls:
- m_Target: {fileID: 3757098214480144579} - m_Target: {fileID: 0}
m_MethodName: OnClickDouble m_MethodName: OnClickDouble
m_Mode: 1 m_Mode: 1
m_Arguments: m_Arguments:
...@@ -19670,7 +19651,7 @@ MonoBehaviour: ...@@ -19670,7 +19651,7 @@ MonoBehaviour:
m_OnClick: m_OnClick:
m_PersistentCalls: m_PersistentCalls:
m_Calls: m_Calls:
- m_Target: {fileID: 3757098214480144579} - m_Target: {fileID: 0}
m_MethodName: OnClickCoin m_MethodName: OnClickCoin
m_Mode: 1 m_Mode: 1
m_Arguments: m_Arguments:
......
BoomMaster/Assets/Res/Prefabs/Levels/Level5.prefab
View file @ 3e0ddf6e
...@@ -3998,7 +3998,7 @@ MonoBehaviour: ...@@ -3998,7 +3998,7 @@ MonoBehaviour:
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
m_cameraTrans: {fileID: 4902499387553085372} m_cameraTrans: {fileID: 4902499387553085372}
m_rootTrans: {fileID: 0} m_rootTrans: {fileID: 5413662012429062968}
lineRenderer: {fileID: 8235209161698779657} lineRenderer: {fileID: 8235209161698779657}
--- !u!1 &4902499387553085373 --- !u!1 &4902499387553085373
GameObject: GameObject:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment