Commit 9ecf27e1 authored by Ever's avatar Ever

更新代码

parent d26ef371
...@@ -220,7 +220,7 @@ GameObject: ...@@ -220,7 +220,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 &39056318 --- !u!224 &39056318
RectTransform: RectTransform:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
...@@ -360,6 +360,152 @@ CanvasRenderer: ...@@ -360,6 +360,152 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 92769422} m_GameObject: {fileID: 92769422}
m_CullTransparentMesh: 1 m_CullTransparentMesh: 1
--- !u!1 &244830825
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 244830829}
- component: {fileID: 244830828}
- component: {fileID: 244830827}
- component: {fileID: 244830826}
m_Layer: 0
m_Name: GetVideoCam
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
--- !u!114 &244830826
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 244830825}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 02641e9e576064f35a2dab995981e691, type: 3}
m_Name:
m_EditorClassIdentifier:
recordMicrophone: 0
audioListener: {fileID: 297775246}
cam: {fileID: 244830828}
targetpos: {fileID: 2022440215}
--- !u!114 &244830827
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 244830825}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: a79441f348de89743a2939f4d699eac1, type: 3}
m_Name:
m_EditorClassIdentifier:
m_RenderShadows: 1
m_RequiresDepthTextureOption: 2
m_RequiresOpaqueTextureOption: 2
m_CameraType: 0
m_Cameras: []
m_RendererIndex: -1
m_VolumeLayerMask:
serializedVersion: 2
m_Bits: 1
m_VolumeTrigger: {fileID: 0}
m_VolumeFrameworkUpdateModeOption: 2
m_RenderPostProcessing: 0
m_Antialiasing: 0
m_AntialiasingQuality: 2
m_StopNaN: 0
m_Dithering: 0
m_ClearDepth: 1
m_AllowXRRendering: 1
m_AllowHDROutput: 1
m_UseScreenCoordOverride: 0
m_ScreenSizeOverride: {x: 0, y: 0, z: 0, w: 0}
m_ScreenCoordScaleBias: {x: 0, y: 0, z: 0, w: 0}
m_RequiresDepthTexture: 0
m_RequiresColorTexture: 0
m_Version: 2
m_TaaSettings:
quality: 3
frameInfluence: 0.1
jitterScale: 1
mipBias: 0
varianceClampScale: 0.9
contrastAdaptiveSharpening: 0
--- !u!20 &244830828
Camera:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 244830825}
m_Enabled: 1
serializedVersion: 2
m_ClearFlags: 1
m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0}
m_projectionMatrixMode: 1
m_GateFitMode: 2
m_FOVAxisMode: 0
m_Iso: 200
m_ShutterSpeed: 0.005
m_Aperture: 16
m_FocusDistance: 10
m_FocalLength: 50
m_BladeCount: 5
m_Curvature: {x: 2, y: 11}
m_BarrelClipping: 0.25
m_Anamorphism: 0
m_SensorSize: {x: 36, y: 24}
m_LensShift: {x: 0, y: 0}
m_NormalizedViewPortRect:
serializedVersion: 2
x: 0
y: 0
width: 1
height: 1
near clip plane: 0.3
far clip plane: 1000
field of view: 60
orthographic: 1
orthographic size: 5
m_Depth: 0
m_CullingMask:
serializedVersion: 2
m_Bits: 4294967295
m_RenderingPath: -1
m_TargetTexture: {fileID: 8400000, guid: c1a3fcfca8dc68c4cb9e30ec59a61a52, type: 2}
m_TargetDisplay: 0
m_TargetEye: 3
m_HDR: 1
m_AllowMSAA: 1
m_AllowDynamicResolution: 0
m_ForceIntoRT: 0
m_OcclusionCulling: 1
m_StereoConvergence: 10
m_StereoSeparation: 0.022
--- !u!4 &244830829
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 244830825}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -0.06, y: -0.18, z: -70}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 1806866772}
m_Father: {fileID: 0}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &273669453 --- !u!1 &273669453
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
...@@ -564,7 +710,7 @@ Transform: ...@@ -564,7 +710,7 @@ Transform:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 297775245} m_GameObject: {fileID: 297775245}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: -69.8} m_LocalPosition: {x: 0, y: 0, z: -70}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0 m_ConstrainProportionsScale: 0
m_Children: [] m_Children: []
...@@ -752,7 +898,7 @@ RectTransform: ...@@ -752,7 +898,7 @@ RectTransform:
- {fileID: 1955086771} - {fileID: 1955086771}
- {fileID: 577897817} - {fileID: 577897817}
m_Father: {fileID: 0} m_Father: {fileID: 0}
m_RootOrder: 1 m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0} m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0}
...@@ -825,7 +971,7 @@ Transform: ...@@ -825,7 +971,7 @@ Transform:
m_ConstrainProportionsScale: 0 m_ConstrainProportionsScale: 0
m_Children: [] m_Children: []
m_Father: {fileID: 0} m_Father: {fileID: 0}
m_RootOrder: 2 m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!224 &529565339 stripped --- !u!224 &529565339 stripped
RectTransform: RectTransform:
...@@ -1314,6 +1460,42 @@ CanvasRenderer: ...@@ -1314,6 +1460,42 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 945105132} m_GameObject: {fileID: 945105132}
m_CullTransparentMesh: 1 m_CullTransparentMesh: 1
--- !u!1 &1054588896
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1054588897}
m_Layer: 5
m_Name: PicParent
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &1054588897
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1054588896}
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: 6714159874655592954}
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: 0}
m_SizeDelta: {x: 100, y: 100}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &1083628060 --- !u!1 &1083628060
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
...@@ -2242,6 +2424,90 @@ CanvasRenderer: ...@@ -2242,6 +2424,90 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1778506297} m_GameObject: {fileID: 1778506297}
m_CullTransparentMesh: 1 m_CullTransparentMesh: 1
--- !u!1 &1806866771
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1806866772}
- component: {fileID: 1806866773}
m_Layer: 0
m_Name: GameObject
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &1806866772
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1806866771}
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: 244830829}
m_RootOrder: -1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!212 &1806866773
SpriteRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1806866771}
m_Enabled: 1
m_CastShadows: 0
m_ReceiveShadows: 0
m_DynamicOccludee: 1
m_StaticShadowCaster: 0
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RayTracingMode: 0
m_RayTraceProcedural: 0
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
m_StaticBatchRoot: {fileID: 0}
m_ProbeAnchor: {fileID: 0}
m_LightProbeVolumeOverride: {fileID: 0}
m_ScaleInLightmap: 1
m_ReceiveGI: 1
m_PreserveUVs: 0
m_IgnoreNormalsForChartDetection: 0
m_ImportantGI: 0
m_StitchLightmapSeams: 1
m_SelectedEditorRenderState: 0
m_MinimumChartSize: 4
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
m_Sprite: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0
m_FlipY: 0
m_DrawMode: 0
m_Size: {x: 1, y: 1}
m_AdaptiveModeThreshold: 0.5
m_SpriteTileMode: 0
m_WasSpriteAssigned: 0
m_MaskInteraction: 0
m_SpriteSortPoint: 0
--- !u!1 &1864366138 --- !u!1 &1864366138
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
...@@ -2648,14 +2914,13 @@ GameObject: ...@@ -2648,14 +2914,13 @@ GameObject:
m_Component: m_Component:
- component: {fileID: 1955086771} - component: {fileID: 1955086771}
- component: {fileID: 1955086772} - component: {fileID: 1955086772}
- component: {fileID: 1955086773}
m_Layer: 0 m_Layer: 0
m_Name: GameEnd m_Name: GameEnd
m_TagString: Untagged m_TagString: Untagged
m_Icon: {fileID: 0} m_Icon: {fileID: 0}
m_NavMeshLayer: 0 m_NavMeshLayer: 0
m_StaticEditorFlags: 0 m_StaticEditorFlags: 0
m_IsActive: 1 m_IsActive: 0
--- !u!224 &1955086771 --- !u!224 &1955086771
RectTransform: RectTransform:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
...@@ -2698,23 +2963,7 @@ MonoBehaviour: ...@@ -2698,23 +2963,7 @@ MonoBehaviour:
scrollRect: {fileID: 1921562645} scrollRect: {fileID: 1921562645}
ItemParent: {fileID: 1994532034} ItemParent: {fileID: 1994532034}
item_obj: {fileID: 1219722612} item_obj: {fileID: 1219722612}
cam: {fileID: 0} cam: {fileID: 244830826}
--- !u!114 &1955086773
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1955086770}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 02641e9e576064f35a2dab995981e691, type: 3}
m_Name:
m_EditorClassIdentifier:
recordMicrophone: 0
audioListener: {fileID: 0}
cam: {fileID: 0}
targetpos: {fileID: 0}
--- !u!1 &1994532031 --- !u!1 &1994532031
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
...@@ -4606,8 +4855,6 @@ GameObject: ...@@ -4606,8 +4855,6 @@ GameObject:
serializedVersion: 6 serializedVersion: 6
m_Component: m_Component:
- component: {fileID: 7255145337877875340} - component: {fileID: 7255145337877875340}
- component: {fileID: 4669581221058272242}
- component: {fileID: 7026147387852768214}
m_Layer: 5 m_Layer: 5
m_Name: Viewport m_Name: Viewport
m_TagString: Untagged m_TagString: Untagged
...@@ -5838,14 +6085,6 @@ MonoBehaviour: ...@@ -5838,14 +6085,6 @@ MonoBehaviour:
width: 0 width: 0
height: 0 height: 0
frameRate: 30 frameRate: 30
--- !u!222 &4669581221058272242
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2043576560963876187}
m_CullTransparentMesh: 1
--- !u!1 &4951044742539944732 --- !u!1 &4951044742539944732
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
...@@ -6660,6 +6899,7 @@ RectTransform: ...@@ -6660,6 +6899,7 @@ RectTransform:
m_Children: m_Children:
- {fileID: 1643100474} - {fileID: 1643100474}
- {fileID: 2286449935771591628} - {fileID: 2286449935771591628}
- {fileID: 1054588897}
- {fileID: 7404120260333757745} - {fileID: 7404120260333757745}
m_Father: {fileID: 1147557151012020857} m_Father: {fileID: 1147557151012020857}
m_RootOrder: -1 m_RootOrder: -1
...@@ -6723,19 +6963,6 @@ GameObject: ...@@ -6723,19 +6963,6 @@ GameObject:
m_NavMeshLayer: 0 m_NavMeshLayer: 0
m_StaticEditorFlags: 0 m_StaticEditorFlags: 0
m_IsActive: 1 m_IsActive: 1
--- !u!114 &7026147387852768214
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2043576560963876187}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 31a19414c41e5ae4aae2af33fee712f6, type: 3}
m_Name:
m_EditorClassIdentifier:
m_ShowMaskGraphic: 1
--- !u!222 &7076014962378708244 --- !u!222 &7076014962378708244
CanvasRenderer: CanvasRenderer:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
...@@ -6846,6 +7073,7 @@ MonoBehaviour: ...@@ -6846,6 +7073,7 @@ MonoBehaviour:
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
JIndu: {fileID: 1438794556952302352} JIndu: {fileID: 1438794556952302352}
PicParent: {fileID: 1054588897}
--- !u!224 &7404120260333757745 --- !u!224 &7404120260333757745
RectTransform: RectTransform:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
...@@ -7264,7 +7492,6 @@ MonoBehaviour: ...@@ -7264,7 +7492,6 @@ MonoBehaviour:
showAreaId: 1 showAreaId: 1
tempValue1: 120 tempValue1: 120
tempValue2: 120 tempValue2: 120
cam: {fileID: 0}
ListMoveOffSet: 35 ListMoveOffSet: 35
PlayImagePaent: {fileID: 1943337312} PlayImagePaent: {fileID: 1943337312}
--- !u!1 &8136062125027934181 --- !u!1 &8136062125027934181
......
...@@ -8,6 +8,7 @@ public class LoadingPanel : MonoBehaviour ...@@ -8,6 +8,7 @@ public class LoadingPanel : MonoBehaviour
{ {
public Slider JIndu; public Slider JIndu;
public Transform PicParent;
// Start is called before the first frame update // Start is called before the first frame update
void Start() void Start()
{ {
...@@ -25,11 +26,18 @@ public class LoadingPanel : MonoBehaviour ...@@ -25,11 +26,18 @@ public class LoadingPanel : MonoBehaviour
private void ClosePanel(object[] values) private void ClosePanel(object[] values)
{ {
gameObject.SetActive(false); StartCoroutine(DelayClose());
} }
IEnumerator DelayClose()
{
yield return new WaitForSeconds(0.2f);
gameObject.SetActive(false);
}
float jindu = 0;
private void ChangeSlider(object[] values) private void ChangeSlider(object[] values)
{ {
//JIndu.value = value; jindu += 0.1f;//(float)values[0];
JIndu.value = jindu;
} }
} }
...@@ -39,7 +39,6 @@ public class gameSceneLogic : MonoBehaviour, IEventHandler ...@@ -39,7 +39,6 @@ public class gameSceneLogic : MonoBehaviour, IEventHandler
public float tempValue2 = 130f; public float tempValue2 = 130f;
private float tempValue3 = 5f; private float tempValue3 = 5f;
public ReplayCam cam;
public float ListMoveOffSet = 35; public float ListMoveOffSet = 35;
public Transform PlayImagePaent; //操作的图片的父节点 public Transform PlayImagePaent; //操作的图片的父节点
...@@ -499,6 +498,7 @@ public class gameSceneLogic : MonoBehaviour, IEventHandler ...@@ -499,6 +498,7 @@ public class gameSceneLogic : MonoBehaviour, IEventHandler
} }
else else
{ {
EventDispatcher.Dispatch(EventName.Event.Event_LoadingChange);
return 0; //下载完后先不操作了 return 0; //下载完后先不操作了
utilsTools.delTimeHandler(gameObject, "tryDownColorImg"); utilsTools.delTimeHandler(gameObject, "tryDownColorImg");
Image image = transform.Find("ingameLoad/loadImg").GetComponent<Image>(); Image image = transform.Find("ingameLoad/loadImg").GetComponent<Image>();
...@@ -516,6 +516,7 @@ public class gameSceneLogic : MonoBehaviour, IEventHandler ...@@ -516,6 +516,7 @@ public class gameSceneLogic : MonoBehaviour, IEventHandler
} }
void onZipFileHandler(GameScenUserInfo gameScenUser) void onZipFileHandler(GameScenUserInfo gameScenUser)
{ {
EventDispatcher.Dispatch(EventName.Event.Event_LoadingChange);//下载完成
Debug.Log("handlerLoadingPosition hand begin"); Debug.Log("handlerLoadingPosition hand begin");
string zpath = utilsTools.getWritableByPath("outFiles/" + gameScenUser.id + ".zip"); string zpath = utilsTools.getWritableByPath("outFiles/" + gameScenUser.id + ".zip");
if (utilsTools.IsWin == true) if (utilsTools.IsWin == true)
...@@ -555,6 +556,7 @@ public class gameSceneLogic : MonoBehaviour, IEventHandler ...@@ -555,6 +556,7 @@ public class gameSceneLogic : MonoBehaviour, IEventHandler
//下载和解压zip 没有下载过就去下载线稿图 //下载和解压zip 没有下载过就去下载线稿图
void onInitViewShowDataEvent(List<UnityEngine.Object> uobjects, List<System.Object> objects) void onInitViewShowDataEvent(List<UnityEngine.Object> uobjects, List<System.Object> objects)
{ {
EventDispatcher.Dispatch(EventName.Event.Event_LoadingChange); //开始下载或者解压
utilsTools.setGDataByKey("firstT", utilsTools.getTotalMillisecond()); utilsTools.setGDataByKey("firstT", utilsTools.getTotalMillisecond());
GameScenUserInfo gameScenUser = (GameScenUserInfo)objects[0]; GameScenUserInfo gameScenUser = (GameScenUserInfo)objects[0];
string zpath = utilsTools.getWritableByPath("outFiles/" + gameScenUser.id+".zip"); string zpath = utilsTools.getWritableByPath("outFiles/" + gameScenUser.id+".zip");
...@@ -855,21 +857,7 @@ public class gameSceneLogic : MonoBehaviour, IEventHandler ...@@ -855,21 +857,7 @@ public class gameSceneLogic : MonoBehaviour, IEventHandler
}, 40); }, 40);
} }
/// <summary>
/// 开始录屏,调用ReplayCam.StartRecording()方法
/// </summary>
public void StartRectord()
{
cam.StartRecording();
}
/// <summary>
/// 结束录屏,调用ReplayCam.StopRectord()方法
/// </summary>
public void StopRectord()
{
Debug.Log($"录制结束");
cam.StopRecording();
}
public void onTestTemp1() public void onTestTemp1()
{ {
//Image image = transform.Find("ingameLoad/loadImg").GetComponent<Image>(); //Image image = transform.Find("ingameLoad/loadImg").GetComponent<Image>();
......
...@@ -38,6 +38,34 @@ public class GroupListManager : MonoBehaviour ...@@ -38,6 +38,34 @@ public class GroupListManager : MonoBehaviour
AllProcress_Text.gameObject.SetActive(true); AllProcress_Text.gameObject.SetActive(true);
} }
private void Update()
{
if (Input.GetKeyDown(KeyCode.A))
{
List<short> list = new List<short>();
for (int i = 0; i < 1; i++)
{
for (int j = 0; j < 2048; j++)
{
list.Add((short)UnityEngine.Random.Range(0, 1000));
}
}
System.Diagnostics.Stopwatch sw = new System.Diagnostics.Stopwatch();
for (int i = 0; i < 12; i++)
{
sw.Start();
for (int j = 0; j < list.Count; j++)
{
}
sw.Stop();
Debug.Log("耗时:" + sw.ElapsedMilliseconds);
}
}
}
private void ResiterEvent(bool flag) private void ResiterEvent(bool flag)
{ {
EventDispatcher.RegisterEvent(EventName.Event.Event_GroupListCreate, CreateGroup, flag); EventDispatcher.RegisterEvent(EventName.Event.Event_GroupListCreate, CreateGroup, flag);
......
...@@ -599,7 +599,7 @@ public class mainGameView : MonoBehaviour //大图的处理、具体的玩法 ...@@ -599,7 +599,7 @@ public class mainGameView : MonoBehaviour //大图的处理、具体的玩法
else else
{ {
DownLoadFileinfos.Add(url); DownLoadFileinfos.Add(url);
EventDispatcher.Dispatch(EventName.Event.Event_LoadingChange); //加载完成
if (DownLoadFileinfos.Count >= 3) if (DownLoadFileinfos.Count >= 3)
{ {
StartGame(); StartGame();
...@@ -652,6 +652,7 @@ public class mainGameView : MonoBehaviour //大图的处理、具体的玩法 ...@@ -652,6 +652,7 @@ public class mainGameView : MonoBehaviour //大图的处理、具体的玩法
} }
else else
{ {
EventDispatcher.Dispatch(EventName.Event.Event_LoadingChange);//加载完成
DownLoadFileinfos.Add(url); DownLoadFileinfos.Add(url);
if (DownLoadFileinfos.Count >= 3) if (DownLoadFileinfos.Count >= 3)
{ {
...@@ -766,12 +767,15 @@ public class mainGameView : MonoBehaviour //大图的处理、具体的玩法 ...@@ -766,12 +767,15 @@ public class mainGameView : MonoBehaviour //大图的处理、具体的玩法
bytesInitDigitMatrix(bytes); bytesInitDigitMatrix(bytes);
Debug.Log("bin初始化完成--------------"); Debug.Log("bin初始化完成--------------");
}); });
utilsTools.setGDataByKey("loadBinEnd", utilsTools.getTotalMillisecond()); //utilsTools.setGDataByKey("loadBinEnd", utilsTools.getTotalMillisecond());
utilsTools.setGDataByKey("downJson", utilsTools.getTotalMillisecond()); //utilsTools.setGDataByKey("downJson", utilsTools.getTotalMillisecond());
EventDispatcher.Dispatch(EventName.Event.Event_LoadingChange); //开始加载文件
loadFileInfo(gameUserInfo.json, jsonPath, 3); loadFileInfo(gameUserInfo.json, jsonPath, 3);
utilsTools.setGDataByKey("loadGaoQing", utilsTools.getTotalMillisecond()); //utilsTools.setGDataByKey("loadGaoQing", utilsTools.getTotalMillisecond());
loadFileInfo(gameUserInfo.img, linePath, 1); loadFileInfo(gameUserInfo.img, linePath, 1);
utilsTools.setGDataByKey("loadJpg", utilsTools.getTotalMillisecond()); //utilsTools.setGDataByKey("loadJpg", utilsTools.getTotalMillisecond());
loadFileInfo(gameUserInfo.finishImg, colorPath, 2); loadFileInfo(gameUserInfo.finishImg, colorPath, 2);
return true; return true;
} }
...@@ -1724,7 +1728,9 @@ public class mainGameView : MonoBehaviour //大图的处理、具体的玩法 ...@@ -1724,7 +1728,9 @@ public class mainGameView : MonoBehaviour //大图的处理、具体的玩法
var jsondata = getdata(); var jsondata = getdata();
EventDispatcher.Dispatch(EventName.Event.Event_LoadingChange); //开始初始化
item.GetComponent<GameMgr>().Init(png, jpg, jsondata); item.GetComponent<GameMgr>().Init(png, jpg, jsondata);
} }
......
...@@ -25,22 +25,28 @@ public class SaveManager : MonoBehaviour ...@@ -25,22 +25,28 @@ public class SaveManager : MonoBehaviour
instance = this; instance = this;
} }
public void SaveBin(string pngname,ResJsonData data) public void SaveRes(string key, ResJsonData data, Texture2D png)
{
SaveBin(key,data);
SavePng(key,png);
}
public void SaveBin(string key,ResJsonData data)
{ {
string json= JsonUtility.ToJson(data); string json= JsonUtility.ToJson(data);
SaveBin(pngname,json); SaveBin(key,json);
} }
/// <summary> /// <summary>
/// 保存bin文件 /// 保存bin文件
/// </summary> /// </summary>
/// <param name="path"></param> /// <param key="path"></param>
/// <param name="json"></param> /// <param key="json"></param>
public void SaveBin(string pngname, string json) public void SaveBin(string key, string json)
{ {
FileStream fs = new FileStream(SavePath+$"{name}.bin", FileMode.Create, FileAccess.Write); FileStream fs = new FileStream(SavePath+$"{key}.bin", FileMode.Create, FileAccess.Write);
BinaryFormatter saveBf = new BinaryFormatter(); BinaryFormatter saveBf = new BinaryFormatter();
saveBf.Serialize(fs, json); saveBf.Serialize(fs, json);
fs.Close(); fs.Close();
...@@ -51,41 +57,20 @@ public class SaveManager : MonoBehaviour ...@@ -51,41 +57,20 @@ public class SaveManager : MonoBehaviour
/// </summary> /// </summary>
/// <param name="path"></param> /// <param name="path"></param>
/// <param name="png"></param> /// <param name="png"></param>
public void SavePng(Texture2D png) public void SavePng(string key,Texture2D png)
{ {
//var colors = png.GetPixels();
//for (int i = 0; i < png.width; i+=2)
//{
// for (int j = 0; j < png.height; j+=2)
// {
// png.SetPixel(i, j, new Color(1, 1, 1, 1));
// }
//}
//png.Apply();
byte[] dataBytes = png.EncodeToPNG(); byte[] dataBytes = png.EncodeToPNG();
FileStream fs = File.Open(SavePath+$"{png.name}.png", FileMode.OpenOrCreate); FileStream fs = File.Open(SavePath+$"{key}.png", FileMode.OpenOrCreate);
fs.Write(dataBytes, 0, dataBytes.Length); fs.Write(dataBytes, 0, dataBytes.Length);
fs.Flush(); fs.Flush();
fs.Close(); fs.Close();
} }
public void SaveJPG(Texture2D png) public void SaveJPG(string key, Texture2D png)
{ {
//var colors = png.GetPixels();
//for (int i = 0; i < png.width; i+=2)
//{
// for (int j = 0; j < png.height; j+=2)
// {
// png.SetPixel(i, j, new Color(1, 1, 1, 1));
// }
//}
//png.Apply();
byte[] dataBytes = png.EncodeToPNG(); byte[] dataBytes = png.EncodeToPNG();
FileStream fs = File.Open(SavePath + $"{png.name}.jpg", FileMode.OpenOrCreate); FileStream fs = File.Open(SavePath + $"{key}.jpg", FileMode.OpenOrCreate);
fs.Write(dataBytes, 0, dataBytes.Length); fs.Write(dataBytes, 0, dataBytes.Length);
fs.Flush(); fs.Flush();
fs.Close(); fs.Close();
......
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