Skip to content

Commit da90c29

Browse files
jcs090218jcs090218
committed
Update Version to 1.3.3
1 parent 74953cd commit da90c29

File tree

328 files changed

+36176
-2709
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

328 files changed

+36176
-2709
lines changed

‎Assets/FrameworkTest_Assets/Scripts/FitPushScreen_Test.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ private void FitPushScreen()
9797

9898
Vector2 camPosToScreen = cam.WorldToScreenPoint(camPos);
9999

100-
RectTransform appRect = JCS_UIManager.instance.GetAppRect();
100+
RectTransform appRect = JCS_Canvas.instance.GetAppRect();
101101
//Vector2 screenRect = appRect.sizeDelta;
102102
Vector2 screenRect = new Vector2(Screen.width, Screen.height);
103103

‎Assets/FrameworkTest_Assets/Scripts/FollowMouse_Test.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ private void Update()
3939
//this.transform.position = Input.mousePosition;
4040

4141
Vector2 pos;
42-
Canvas myCanvas = JCS_UIManager.instance.GetJCSCanvas().GetCanvas();
42+
Canvas myCanvas = JCS_Canvas.instance.GetCanvas();
4343
RectTransformUtility.ScreenPointToLocalPointInRectangle(myCanvas.transform as RectTransform, Input.mousePosition, myCanvas.worldCamera, out pos);
4444
transform.position = JCS_Input.CanvasMousePosition();
4545

‎Assets/JCSUnity_Framework/Animations/Specials.meta‎

Lines changed: 9 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Assets/JCSUnity_Framework/Animations/Specials/meso_bag_anim.anim‎

Lines changed: 79 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,79 @@
1+
%YAML 1.1
2+
%TAG !u! tag:unity3d.com,2011:
3+
--- !u!74 &7400000
4+
AnimationClip:
5+
m_ObjectHideFlags: 0
6+
m_PrefabParentObject: {fileID: 0}
7+
m_PrefabInternal: {fileID: 0}
8+
m_Name: meso_bag_anim
9+
serializedVersion: 6
10+
m_Legacy: 0
11+
m_Compressed: 0
12+
m_UseHighQualityCurve: 1
13+
m_RotationCurves: []
14+
m_CompressedRotationCurves: []
15+
m_EulerCurves: []
16+
m_PositionCurves: []
17+
m_ScaleCurves: []
18+
m_FloatCurves: []
19+
m_PPtrCurves:
20+
- curve:
21+
- time: 0
22+
value: {fileID: 21300000, guid: ec350fcc7a59d3d46a14421fa97ae0b2, type: 3}
23+
- time: 0.33333334
24+
value: {fileID: 21300000, guid: 279dd7db7b9a0d345a9c002668811733, type: 3}
25+
- time: 0.6666667
26+
value: {fileID: 21300000, guid: ef9a846ae4be8834fbf6d377e1cce2dd, type: 3}
27+
- time: 1
28+
value: {fileID: 21300000, guid: 03c01de437fc0374e9a19b5a0697807a, type: 3}
29+
- time: 1.3333334
30+
value: {fileID: 21300000, guid: ec350fcc7a59d3d46a14421fa97ae0b2, type: 3}
31+
attribute: m_Sprite
32+
path:
33+
classID: 212
34+
script: {fileID: 0}
35+
m_SampleRate: 30
36+
m_WrapMode: 0
37+
m_Bounds:
38+
m_Center: {x: 0, y: 0, z: 0}
39+
m_Extent: {x: 0, y: 0, z: 0}
40+
m_ClipBindingConstant:
41+
genericBindings:
42+
- path: 0
43+
attribute: 0
44+
script: {fileID: 0}
45+
classID: 212
46+
customType: 23
47+
isPPtrCurve: 1
48+
pptrCurveMapping:
49+
- {fileID: 21300000, guid: ec350fcc7a59d3d46a14421fa97ae0b2, type: 3}
50+
- {fileID: 21300000, guid: 279dd7db7b9a0d345a9c002668811733, type: 3}
51+
- {fileID: 21300000, guid: ef9a846ae4be8834fbf6d377e1cce2dd, type: 3}
52+
- {fileID: 21300000, guid: 03c01de437fc0374e9a19b5a0697807a, type: 3}
53+
- {fileID: 21300000, guid: ec350fcc7a59d3d46a14421fa97ae0b2, type: 3}
54+
m_AnimationClipSettings:
55+
serializedVersion: 2
56+
m_AdditiveReferencePoseClip: {fileID: 0}
57+
m_AdditiveReferencePoseTime: 0
58+
m_StartTime: 0
59+
m_StopTime: 1.3666667
60+
m_OrientationOffsetY: 0
61+
m_Level: 0
62+
m_CycleOffset: 0
63+
m_HasAdditiveReferencePose: 0
64+
m_LoopTime: 1
65+
m_LoopBlend: 0
66+
m_LoopBlendOrientation: 0
67+
m_LoopBlendPositionY: 0
68+
m_LoopBlendPositionXZ: 0
69+
m_KeepOriginalOrientation: 0
70+
m_KeepOriginalPositionY: 1
71+
m_KeepOriginalPositionXZ: 0
72+
m_HeightFromFeet: 0
73+
m_Mirror: 0
74+
m_EditorCurves: []
75+
m_EulerEditorCurves: []
76+
m_HasGenericRootTransform: 0
77+
m_HasMotionFloatCurves: 0
78+
m_GenerateMotionCurves: 0
79+
m_Events: []

‎Assets/JCSUnity_Framework/Animations/Specials/meso_bag_anim.anim.meta‎

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Assets/JCSUnity_Framework/Animations/Specials/meso_bag_anim.controller‎

Lines changed: 67 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,67 @@
1+
%YAML 1.1
2+
%TAG !u! tag:unity3d.com,2011:
3+
--- !u!91 &9100000
4+
AnimatorController:
5+
m_ObjectHideFlags: 0
6+
m_PrefabParentObject: {fileID: 0}
7+
m_PrefabInternal: {fileID: 0}
8+
m_Name: meso_bag_anim
9+
serializedVersion: 5
10+
m_AnimatorParameters: []
11+
m_AnimatorLayers:
12+
- serializedVersion: 5
13+
m_Name: Base Layer
14+
m_StateMachine: {fileID: 110771628}
15+
m_Mask: {fileID: 0}
16+
m_Motions: []
17+
m_Behaviours: []
18+
m_BlendingMode: 0
19+
m_SyncedLayerIndex: -1
20+
m_DefaultWeight: 0
21+
m_IKPass: 0
22+
m_SyncedLayerAffectsTiming: 0
23+
m_Controller: {fileID: 9100000}
24+
--- !u!1102 &110253534
25+
AnimatorState:
26+
serializedVersion: 5
27+
m_ObjectHideFlags: 1
28+
m_PrefabParentObject: {fileID: 0}
29+
m_PrefabInternal: {fileID: 0}
30+
m_Name: meso_bag_anim
31+
m_Speed: 1
32+
m_CycleOffset: 0
33+
m_Transitions: []
34+
m_StateMachineBehaviours: []
35+
m_Position: {x: 50, y: 50, z: 0}
36+
m_IKOnFeet: 0
37+
m_WriteDefaultValues: 1
38+
m_Mirror: 0
39+
m_SpeedParameterActive: 0
40+
m_MirrorParameterActive: 0
41+
m_CycleOffsetParameterActive: 0
42+
m_Motion: {fileID: 7400000, guid: 4cf357ccd0f466f4c81b1b7414b9d854, type: 2}
43+
m_Tag:
44+
m_SpeedParameter:
45+
m_MirrorParameter:
46+
m_CycleOffsetParameter:
47+
--- !u!1107 &110771628
48+
AnimatorStateMachine:
49+
serializedVersion: 5
50+
m_ObjectHideFlags: 1
51+
m_PrefabParentObject: {fileID: 0}
52+
m_PrefabInternal: {fileID: 0}
53+
m_Name: Base Layer
54+
m_ChildStates:
55+
- serializedVersion: 1
56+
m_State: {fileID: 110253534}
57+
m_Position: {x: 200, y: 0, z: 0}
58+
m_ChildStateMachines: []
59+
m_AnyStateTransitions: []
60+
m_EntryTransitions: []
61+
m_StateMachineTransitions: {}
62+
m_StateMachineBehaviours: []
63+
m_AnyStatePosition: {x: 50, y: 20, z: 0}
64+
m_EntryPosition: {x: 50, y: 120, z: 0}
65+
m_ExitPosition: {x: 800, y: 120, z: 0}
66+
m_ParentStateMachinePosition: {x: 800, y: 20, z: 0}
67+
m_DefaultState: {fileID: 110253534}

‎Assets/JCSUnity_Framework/Animations/Specials/meso_bag_anim.controller.meta‎

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Assets/JCSUnity_Framework/Animations/Specials/meso_copper_anim.anim‎

Lines changed: 79 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,79 @@
1+
%YAML 1.1
2+
%TAG !u! tag:unity3d.com,2011:
3+
--- !u!74 &7400000
4+
AnimationClip:
5+
m_ObjectHideFlags: 0
6+
m_PrefabParentObject: {fileID: 0}
7+
m_PrefabInternal: {fileID: 0}
8+
m_Name: meso_copper_anim
9+
serializedVersion: 6
10+
m_Legacy: 0
11+
m_Compressed: 0
12+
m_UseHighQualityCurve: 1
13+
m_RotationCurves: []
14+
m_CompressedRotationCurves: []
15+
m_EulerCurves: []
16+
m_PositionCurves: []
17+
m_ScaleCurves: []
18+
m_FloatCurves: []
19+
m_PPtrCurves:
20+
- curve:
21+
- time: 0
22+
value: {fileID: 21300000, guid: 3885c2b53cdecf646bc872c53cc37d45, type: 3}
23+
- time: 0.16666667
24+
value: {fileID: 21300000, guid: 8166da758e2cbc842998c47fb247b14a, type: 3}
25+
- time: 0.33333334
26+
value: {fileID: 21300000, guid: 943da21c7b31b9941a2d28b9a869b6f2, type: 3}
27+
- time: 0.5
28+
value: {fileID: 21300000, guid: 67130527a4b2dbd46afeb94ad22b59a0, type: 3}
29+
- time: 0.6666667
30+
value: {fileID: 21300000, guid: 3885c2b53cdecf646bc872c53cc37d45, type: 3}
31+
attribute: m_Sprite
32+
path:
33+
classID: 212
34+
script: {fileID: 0}
35+
m_SampleRate: 60
36+
m_WrapMode: 0
37+
m_Bounds:
38+
m_Center: {x: 0, y: 0, z: 0}
39+
m_Extent: {x: 0, y: 0, z: 0}
40+
m_ClipBindingConstant:
41+
genericBindings:
42+
- path: 0
43+
attribute: 0
44+
script: {fileID: 0}
45+
classID: 212
46+
customType: 23
47+
isPPtrCurve: 1
48+
pptrCurveMapping:
49+
- {fileID: 21300000, guid: 3885c2b53cdecf646bc872c53cc37d45, type: 3}
50+
- {fileID: 21300000, guid: 8166da758e2cbc842998c47fb247b14a, type: 3}
51+
- {fileID: 21300000, guid: 943da21c7b31b9941a2d28b9a869b6f2, type: 3}
52+
- {fileID: 21300000, guid: 67130527a4b2dbd46afeb94ad22b59a0, type: 3}
53+
- {fileID: 21300000, guid: 3885c2b53cdecf646bc872c53cc37d45, type: 3}
54+
m_AnimationClipSettings:
55+
serializedVersion: 2
56+
m_AdditiveReferencePoseClip: {fileID: 0}
57+
m_AdditiveReferencePoseTime: 0
58+
m_StartTime: 0
59+
m_StopTime: 0.68333334
60+
m_OrientationOffsetY: 0
61+
m_Level: 0
62+
m_CycleOffset: 0
63+
m_HasAdditiveReferencePose: 0
64+
m_LoopTime: 1
65+
m_LoopBlend: 0
66+
m_LoopBlendOrientation: 0
67+
m_LoopBlendPositionY: 0
68+
m_LoopBlendPositionXZ: 0
69+
m_KeepOriginalOrientation: 0
70+
m_KeepOriginalPositionY: 1
71+
m_KeepOriginalPositionXZ: 0
72+
m_HeightFromFeet: 0
73+
m_Mirror: 0
74+
m_EditorCurves: []
75+
m_EulerEditorCurves: []
76+
m_HasGenericRootTransform: 0
77+
m_HasMotionFloatCurves: 0
78+
m_GenerateMotionCurves: 0
79+
m_Events: []

‎Assets/JCSUnity_Framework/Animations/Specials/meso_copper_anim.anim.meta‎

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Assets/JCSUnity_Framework/Animations/Specials/meso_copper_anim.controller‎

Lines changed: 67 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,67 @@
1+
%YAML 1.1
2+
%TAG !u! tag:unity3d.com,2011:
3+
--- !u!91 &9100000
4+
AnimatorController:
5+
m_ObjectHideFlags: 0
6+
m_PrefabParentObject: {fileID: 0}
7+
m_PrefabInternal: {fileID: 0}
8+
m_Name: meso_copper_anim
9+
serializedVersion: 5
10+
m_AnimatorParameters: []
11+
m_AnimatorLayers:
12+
- serializedVersion: 5
13+
m_Name: Base Layer
14+
m_StateMachine: {fileID: 110751326}
15+
m_Mask: {fileID: 0}
16+
m_Motions: []
17+
m_Behaviours: []
18+
m_BlendingMode: 0
19+
m_SyncedLayerIndex: -1
20+
m_DefaultWeight: 0
21+
m_IKPass: 0
22+
m_SyncedLayerAffectsTiming: 0
23+
m_Controller: {fileID: 9100000}
24+
--- !u!1102 &110274914
25+
AnimatorState:
26+
serializedVersion: 5
27+
m_ObjectHideFlags: 1
28+
m_PrefabParentObject: {fileID: 0}
29+
m_PrefabInternal: {fileID: 0}
30+
m_Name: meso_copper_anim
31+
m_Speed: 1
32+
m_CycleOffset: 0
33+
m_Transitions: []
34+
m_StateMachineBehaviours: []
35+
m_Position: {x: 50, y: 50, z: 0}
36+
m_IKOnFeet: 0
37+
m_WriteDefaultValues: 1
38+
m_Mirror: 0
39+
m_SpeedParameterActive: 0
40+
m_MirrorParameterActive: 0
41+
m_CycleOffsetParameterActive: 0
42+
m_Motion: {fileID: 7400000, guid: 477370344951ea6438de057aff99ed78, type: 2}
43+
m_Tag:
44+
m_SpeedParameter:
45+
m_MirrorParameter:
46+
m_CycleOffsetParameter:
47+
--- !u!1107 &110751326
48+
AnimatorStateMachine:
49+
serializedVersion: 5
50+
m_ObjectHideFlags: 1
51+
m_PrefabParentObject: {fileID: 0}
52+
m_PrefabInternal: {fileID: 0}
53+
m_Name: Base Layer
54+
m_ChildStates:
55+
- serializedVersion: 1
56+
m_State: {fileID: 110274914}
57+
m_Position: {x: 200, y: 0, z: 0}
58+
m_ChildStateMachines: []
59+
m_AnyStateTransitions: []
60+
m_EntryTransitions: []
61+
m_StateMachineTransitions: {}
62+
m_StateMachineBehaviours: []
63+
m_AnyStatePosition: {x: 50, y: 20, z: 0}
64+
m_EntryPosition: {x: 50, y: 120, z: 0}
65+
m_ExitPosition: {x: 800, y: 120, z: 0}
66+
m_ParentStateMachinePosition: {x: 800, y: 20, z: 0}
67+
m_DefaultState: {fileID: 110274914}

0 commit comments

Comments
 (0)