가챠 완료
This commit is contained in:
parent
f4eee44563
commit
70e237ed3b
|
|
@ -1,6 +1,7 @@
|
|||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using GUPS.AntiCheat.Protected;
|
||||
using Newtonsoft.Json;
|
||||
using System.Collections.Generic;
|
||||
|
||||
public enum eCollectionMethod { Default, Normal, Gacha, FullCollection, Mission }
|
||||
|
||||
|
|
@ -48,22 +49,15 @@ public class table_album : table_base
|
|||
{
|
||||
return Get_DataList(girl).Find(f => f.e_CollectionMethod == method);
|
||||
}
|
||||
public albumtabledata Get_PreData_orNull(albumtabledata data)
|
||||
public List<albumtabledata> Get_PreDatas(albumtabledata data)
|
||||
{
|
||||
for (int i = 0; i < tableDatas.Count; i++)
|
||||
{
|
||||
if (tableDatas[i].n_Index == data.n_Index)
|
||||
{
|
||||
for (int j = 0; j < 5; j++)
|
||||
{
|
||||
var pre = i - 1;
|
||||
if (pre < 0) return null;
|
||||
var temp = tableDatas[pre];
|
||||
if (temp.e_CollectionMethod == eCollectionMethod.Normal)
|
||||
return temp;
|
||||
}
|
||||
}
|
||||
}
|
||||
return null;
|
||||
int index = tableDatas.FindIndex(t => t.n_Index == data.n_Index);
|
||||
if (index <= 0) return null;
|
||||
|
||||
return tableDatas
|
||||
.GetRange(0, index)
|
||||
.AsEnumerable()
|
||||
.Reverse()
|
||||
.ToList();
|
||||
}
|
||||
}
|
||||
|
|
@ -8,7 +8,7 @@ AnimationClip:
|
|||
m_PrefabAsset: {fileID: 0}
|
||||
m_Name: Gacha_LuckyPoint
|
||||
serializedVersion: 7
|
||||
m_Legacy: 1
|
||||
m_Legacy: 0
|
||||
m_Compressed: 0
|
||||
m_UseHighQualityCurve: 1
|
||||
m_RotationCurves: []
|
||||
|
|
@ -127,7 +127,34 @@ AnimationClip:
|
|||
m_Center: {x: 0, y: 0, z: 0}
|
||||
m_Extent: {x: 0, y: 0, z: 0}
|
||||
m_ClipBindingConstant:
|
||||
genericBindings: []
|
||||
genericBindings:
|
||||
- serializedVersion: 2
|
||||
path: 0
|
||||
attribute: 3
|
||||
script: {fileID: 0}
|
||||
typeID: 4
|
||||
customType: 0
|
||||
isPPtrCurve: 0
|
||||
isIntCurve: 0
|
||||
isSerializeReferenceCurve: 0
|
||||
- serializedVersion: 2
|
||||
path: 0
|
||||
attribute: 538195251
|
||||
script: {fileID: 0}
|
||||
typeID: 224
|
||||
customType: 28
|
||||
isPPtrCurve: 0
|
||||
isIntCurve: 0
|
||||
isSerializeReferenceCurve: 0
|
||||
- serializedVersion: 2
|
||||
path: 0
|
||||
attribute: 4185109675
|
||||
script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
|
||||
typeID: 114
|
||||
customType: 0
|
||||
isPPtrCurve: 0
|
||||
isIntCurve: 0
|
||||
isSerializeReferenceCurve: 0
|
||||
pptrCurveMapping: []
|
||||
m_AnimationClipSettings:
|
||||
serializedVersion: 2
|
||||
|
|
@ -139,7 +166,7 @@ AnimationClip:
|
|||
m_Level: 0
|
||||
m_CycleOffset: 0
|
||||
m_HasAdditiveReferencePose: 0
|
||||
m_LoopTime: 1
|
||||
m_LoopTime: 0
|
||||
m_LoopBlend: 0
|
||||
m_LoopBlendOrientation: 0
|
||||
m_LoopBlendPositionY: 0
|
||||
|
|
|
|||
|
|
@ -0,0 +1,72 @@
|
|||
%YAML 1.1
|
||||
%TAG !u! tag:unity3d.com,2011:
|
||||
--- !u!91 &9100000
|
||||
AnimatorController:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_Name: LuckyPointCard
|
||||
serializedVersion: 5
|
||||
m_AnimatorParameters: []
|
||||
m_AnimatorLayers:
|
||||
- serializedVersion: 5
|
||||
m_Name: Base Layer
|
||||
m_StateMachine: {fileID: 4767797584741138550}
|
||||
m_Mask: {fileID: 0}
|
||||
m_Motions: []
|
||||
m_Behaviours: []
|
||||
m_BlendingMode: 0
|
||||
m_SyncedLayerIndex: -1
|
||||
m_DefaultWeight: 0
|
||||
m_IKPass: 0
|
||||
m_SyncedLayerAffectsTiming: 0
|
||||
m_Controller: {fileID: 9100000}
|
||||
--- !u!1107 &4767797584741138550
|
||||
AnimatorStateMachine:
|
||||
serializedVersion: 6
|
||||
m_ObjectHideFlags: 1
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_Name: Base Layer
|
||||
m_ChildStates:
|
||||
- serializedVersion: 1
|
||||
m_State: {fileID: 8446897555024683593}
|
||||
m_Position: {x: 240, y: 70, z: 0}
|
||||
m_ChildStateMachines: []
|
||||
m_AnyStateTransitions: []
|
||||
m_EntryTransitions: []
|
||||
m_StateMachineTransitions: {}
|
||||
m_StateMachineBehaviours: []
|
||||
m_AnyStatePosition: {x: 50, y: 20, z: 0}
|
||||
m_EntryPosition: {x: 50, y: 120, z: 0}
|
||||
m_ExitPosition: {x: 800, y: 120, z: 0}
|
||||
m_ParentStateMachinePosition: {x: 800, y: 20, z: 0}
|
||||
m_DefaultState: {fileID: 8446897555024683593}
|
||||
--- !u!1102 &8446897555024683593
|
||||
AnimatorState:
|
||||
serializedVersion: 6
|
||||
m_ObjectHideFlags: 1
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_Name: Gacha_LuckyPoint
|
||||
m_Speed: 1
|
||||
m_CycleOffset: 0
|
||||
m_Transitions: []
|
||||
m_StateMachineBehaviours: []
|
||||
m_Position: {x: 50, y: 50, z: 0}
|
||||
m_IKOnFeet: 0
|
||||
m_WriteDefaultValues: 1
|
||||
m_Mirror: 0
|
||||
m_SpeedParameterActive: 0
|
||||
m_MirrorParameterActive: 0
|
||||
m_CycleOffsetParameterActive: 0
|
||||
m_TimeParameterActive: 0
|
||||
m_Motion: {fileID: 7400000, guid: c54a608985440d140b98eb5ebc99441b, type: 2}
|
||||
m_Tag:
|
||||
m_SpeedParameter:
|
||||
m_MirrorParameter:
|
||||
m_CycleOffsetParameter:
|
||||
m_TimeParameter:
|
||||
|
|
@ -0,0 +1,8 @@
|
|||
fileFormatVersion: 2
|
||||
guid: f2e6fe5a9d0121f418f79d48813dc345
|
||||
NativeFormatImporter:
|
||||
externalObjects: {}
|
||||
mainObjectFileID: 9100000
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
|
|
@ -11,7 +11,7 @@ GameObject:
|
|||
- component: {fileID: 1513009740226389320}
|
||||
- component: {fileID: 2252371788284656643}
|
||||
- component: {fileID: 6346176042650486547}
|
||||
- component: {fileID: 5749544827683741712}
|
||||
- component: {fileID: 4945616956776543947}
|
||||
m_Layer: 5
|
||||
m_Name: LuckyPointCard
|
||||
m_TagString: Untagged
|
||||
|
|
@ -66,7 +66,7 @@ MonoBehaviour:
|
|||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_text: 000
|
||||
m_text:
|
||||
m_isRightToLeft: 0
|
||||
m_fontAsset: {fileID: 11400000, guid: 3055b5c28f94e6c4ea6b9a379bb315a5, type: 2}
|
||||
m_sharedMaterial: {fileID: 2100000, guid: 8ffa725990f335d489bf5cbd72b04e51, type: 2}
|
||||
|
|
@ -137,20 +137,25 @@ MonoBehaviour:
|
|||
m_hasFontAssetChanged: 0
|
||||
m_baseMaterial: {fileID: 0}
|
||||
m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
|
||||
--- !u!111 &5749544827683741712
|
||||
Animation:
|
||||
--- !u!95 &4945616956776543947
|
||||
Animator:
|
||||
serializedVersion: 7
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 691197990866929027}
|
||||
m_Enabled: 1
|
||||
serializedVersion: 4
|
||||
m_Animation: {fileID: 7400000, guid: c54a608985440d140b98eb5ebc99441b, type: 2}
|
||||
m_Animations:
|
||||
- {fileID: 7400000, guid: c54a608985440d140b98eb5ebc99441b, type: 2}
|
||||
m_WrapMode: 0
|
||||
m_PlayAutomatically: 1
|
||||
m_Avatar: {fileID: 0}
|
||||
m_Controller: {fileID: 9100000, guid: f2e6fe5a9d0121f418f79d48813dc345, type: 2}
|
||||
m_CullingMode: 0
|
||||
m_UpdateMode: 2
|
||||
m_ApplyRootMotion: 0
|
||||
m_LinearVelocityBlending: 0
|
||||
m_StabilizeFeet: 0
|
||||
m_AnimatePhysics: 0
|
||||
m_UpdateMode: 0
|
||||
m_CullingType: 0
|
||||
m_WarningMessage:
|
||||
m_HasTransformHierarchy: 1
|
||||
m_AllowConstantClipSamplingOptimization: 1
|
||||
m_KeepAnimatorStateOnDisable: 0
|
||||
m_WriteDefaultValuesOnDisable: 0
|
||||
|
|
|
|||
|
|
@ -2724,6 +2724,10 @@ PrefabInstance:
|
|||
propertyPath: m_PlayAutomatically
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6346176042650486547, guid: 59684b397aa758240840f560d3fb71a5, type: 3}
|
||||
propertyPath: m_text
|
||||
value:
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents: []
|
||||
m_RemovedGameObjects: []
|
||||
m_AddedGameObjects: []
|
||||
|
|
@ -11916,6 +11920,82 @@ CanvasRenderer:
|
|||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 303838225}
|
||||
m_CullTransparentMesh: 1
|
||||
--- !u!1 &305452059
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 305452060}
|
||||
- component: {fileID: 305452062}
|
||||
- component: {fileID: 305452061}
|
||||
m_Layer: 5
|
||||
m_Name: rewardbg
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &305452060
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 305452059}
|
||||
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:
|
||||
- {fileID: 777018687}
|
||||
m_Father: {fileID: 2091792063}
|
||||
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: 61}
|
||||
m_SizeDelta: {x: 235, y: 235}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!114 &305452061
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 305452059}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Material: {fileID: 0}
|
||||
m_Color: {r: 1, g: 1, b: 1, a: 1}
|
||||
m_RaycastTarget: 0
|
||||
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
|
||||
m_Maskable: 1
|
||||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_Sprite: {fileID: 21300000, guid: 2170389fe8419ea40a4aceb5387df7a9, type: 3}
|
||||
m_Type: 0
|
||||
m_PreserveAspect: 0
|
||||
m_FillCenter: 1
|
||||
m_FillMethod: 4
|
||||
m_FillAmount: 1
|
||||
m_FillClockwise: 1
|
||||
m_FillOrigin: 0
|
||||
m_UseSpriteMesh: 0
|
||||
m_PixelsPerUnitMultiplier: 1
|
||||
--- !u!222 &305452062
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 305452059}
|
||||
m_CullTransparentMesh: 1
|
||||
--- !u!1 &306046132
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -14237,6 +14317,10 @@ PrefabInstance:
|
|||
propertyPath: m_PlayAutomatically
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6346176042650486547, guid: 59684b397aa758240840f560d3fb71a5, type: 3}
|
||||
propertyPath: m_text
|
||||
value:
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents: []
|
||||
m_RemovedGameObjects: []
|
||||
m_AddedGameObjects: []
|
||||
|
|
@ -18162,6 +18246,10 @@ PrefabInstance:
|
|||
propertyPath: m_PlayAutomatically
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6346176042650486547, guid: 59684b397aa758240840f560d3fb71a5, type: 3}
|
||||
propertyPath: m_text
|
||||
value:
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents: []
|
||||
m_RemovedGameObjects: []
|
||||
m_AddedGameObjects: []
|
||||
|
|
@ -23805,6 +23893,10 @@ PrefabInstance:
|
|||
propertyPath: m_PlayAutomatically
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6346176042650486547, guid: 59684b397aa758240840f560d3fb71a5, type: 3}
|
||||
propertyPath: m_text
|
||||
value:
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents: []
|
||||
m_RemovedGameObjects: []
|
||||
m_AddedGameObjects: []
|
||||
|
|
@ -32540,6 +32632,82 @@ Transform:
|
|||
m_CorrespondingSourceObject: {fileID: 4030569245233116, guid: 46e56f62e4ff899488d1b27766d1eb6d, type: 3}
|
||||
m_PrefabInstance: {fileID: 774943654}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!1 &777018686
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 777018687}
|
||||
- component: {fileID: 777018689}
|
||||
- component: {fileID: 777018688}
|
||||
m_Layer: 5
|
||||
m_Name: i_reward
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &777018687
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 777018686}
|
||||
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: 1
|
||||
m_Children:
|
||||
- {fileID: 845497909}
|
||||
m_Father: {fileID: 305452060}
|
||||
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: 116, y: 121}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!114 &777018688
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 777018686}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Material: {fileID: 0}
|
||||
m_Color: {r: 1, g: 1, b: 1, a: 1}
|
||||
m_RaycastTarget: 0
|
||||
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
|
||||
m_Maskable: 1
|
||||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_Sprite: {fileID: 21300000, guid: af3bdea9ab9e8d4449e22d0d23d27f92, type: 3}
|
||||
m_Type: 0
|
||||
m_PreserveAspect: 0
|
||||
m_FillCenter: 1
|
||||
m_FillMethod: 4
|
||||
m_FillAmount: 1
|
||||
m_FillClockwise: 1
|
||||
m_FillOrigin: 0
|
||||
m_UseSpriteMesh: 0
|
||||
m_PixelsPerUnitMultiplier: 1
|
||||
--- !u!222 &777018689
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 777018686}
|
||||
m_CullTransparentMesh: 1
|
||||
--- !u!1 &780048195
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -36545,6 +36713,142 @@ CanvasRenderer:
|
|||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 844018863}
|
||||
m_CullTransparentMesh: 1
|
||||
--- !u!1 &845497908
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 845497909}
|
||||
- component: {fileID: 845497911}
|
||||
- component: {fileID: 845497910}
|
||||
m_Layer: 5
|
||||
m_Name: t_rewardamount
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &845497909
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 845497908}
|
||||
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: 777018687}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 1, y: 0}
|
||||
m_AnchorMax: {x: 1, y: 0}
|
||||
m_AnchoredPosition: {x: -63.40001, y: -11.100006}
|
||||
m_SizeDelta: {x: 200, y: 50}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!114 &845497910
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 845497908}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Material: {fileID: 0}
|
||||
m_Color: {r: 1, g: 1, b: 1, a: 1}
|
||||
m_RaycastTarget: 0
|
||||
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
|
||||
m_Maskable: 1
|
||||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_text: 000
|
||||
m_isRightToLeft: 0
|
||||
m_fontAsset: {fileID: 11400000, guid: 3055b5c28f94e6c4ea6b9a379bb315a5, type: 2}
|
||||
m_sharedMaterial: {fileID: 2100000, guid: f0e824099790d3445af94a5b86b5cc4a, type: 2}
|
||||
m_fontSharedMaterials: []
|
||||
m_fontMaterial: {fileID: 0}
|
||||
m_fontMaterials: []
|
||||
m_fontColor32:
|
||||
serializedVersion: 2
|
||||
rgba: 4294967295
|
||||
m_fontColor: {r: 1, g: 1, b: 1, a: 1}
|
||||
m_enableVertexGradient: 0
|
||||
m_colorMode: 3
|
||||
m_fontColorGradient:
|
||||
topLeft: {r: 1, g: 1, b: 1, a: 1}
|
||||
topRight: {r: 1, g: 1, b: 1, a: 1}
|
||||
bottomLeft: {r: 1, g: 1, b: 1, a: 1}
|
||||
bottomRight: {r: 1, g: 1, b: 1, a: 1}
|
||||
m_fontColorGradientPreset: {fileID: 0}
|
||||
m_spriteAsset: {fileID: 0}
|
||||
m_tintAllSprites: 0
|
||||
m_StyleSheet: {fileID: 0}
|
||||
m_TextStyleHashCode: -1183493901
|
||||
m_overrideHtmlColors: 0
|
||||
m_faceColor:
|
||||
serializedVersion: 2
|
||||
rgba: 4294967295
|
||||
m_fontSize: 50
|
||||
m_fontSizeBase: 50
|
||||
m_fontWeight: 400
|
||||
m_enableAutoSizing: 0
|
||||
m_fontSizeMin: 25
|
||||
m_fontSizeMax: 100
|
||||
m_fontStyle: 0
|
||||
m_HorizontalAlignment: 4
|
||||
m_VerticalAlignment: 4096
|
||||
m_textAlignment: 65535
|
||||
m_characterSpacing: 0
|
||||
m_wordSpacing: 0
|
||||
m_lineSpacing: 0
|
||||
m_lineSpacingMax: 0
|
||||
m_paragraphSpacing: 0
|
||||
m_charWidthMaxAdj: 0
|
||||
m_TextWrappingMode: 0
|
||||
m_wordWrappingRatios: 0.4
|
||||
m_overflowMode: 0
|
||||
m_linkedTextComponent: {fileID: 0}
|
||||
parentLinkedComponent: {fileID: 0}
|
||||
m_enableKerning: 0
|
||||
m_ActiveFontFeatures: 6e72656b
|
||||
m_enableExtraPadding: 0
|
||||
checkPaddingRequired: 0
|
||||
m_isRichText: 1
|
||||
m_EmojiFallbackSupport: 1
|
||||
m_parseCtrlCharacters: 1
|
||||
m_isOrthographic: 1
|
||||
m_isCullingEnabled: 0
|
||||
m_horizontalMapping: 0
|
||||
m_verticalMapping: 0
|
||||
m_uvLineOffset: 0
|
||||
m_geometrySortingOrder: 0
|
||||
m_IsTextObjectScaleStatic: 0
|
||||
m_VertexBufferAutoSizeReduction: 0
|
||||
m_useMaxVisibleDescender: 1
|
||||
m_pageToDisplay: 1
|
||||
m_margin: {x: 0, y: 0, z: 0, w: 0}
|
||||
m_isUsingLegacyAnimationComponent: 0
|
||||
m_isVolumetricText: 0
|
||||
m_hasFontAssetChanged: 0
|
||||
m_baseMaterial: {fileID: 0}
|
||||
m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
|
||||
--- !u!222 &845497911
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 845497908}
|
||||
m_CullTransparentMesh: 1
|
||||
--- !u!1001 &845557259
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -36641,6 +36945,10 @@ PrefabInstance:
|
|||
propertyPath: m_PlayAutomatically
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6346176042650486547, guid: 59684b397aa758240840f560d3fb71a5, type: 3}
|
||||
propertyPath: m_text
|
||||
value:
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents: []
|
||||
m_RemovedGameObjects: []
|
||||
m_AddedGameObjects: []
|
||||
|
|
@ -47717,13 +48025,14 @@ GameObject:
|
|||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 1086019390}
|
||||
- component: {fileID: 1086019391}
|
||||
m_Layer: 5
|
||||
m_Name: Result
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
m_IsActive: 0
|
||||
--- !u!224 &1086019390
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -47745,6 +48054,21 @@ RectTransform:
|
|||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 0, y: 0}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!114 &1086019391
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1086019389}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: f2e438ad40ab15e42affa2b84a4562c0, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
i_girl: {fileID: 1022641049}
|
||||
go_reward: {fileID: 305452059}
|
||||
t_heartamount: {fileID: 845497910}
|
||||
--- !u!1 &1087989976
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -68712,6 +69036,10 @@ PrefabInstance:
|
|||
propertyPath: m_PlayAutomatically
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6346176042650486547, guid: 59684b397aa758240840f560d3fb71a5, type: 3}
|
||||
propertyPath: m_text
|
||||
value:
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents: []
|
||||
m_RemovedGameObjects: []
|
||||
m_AddedGameObjects: []
|
||||
|
|
@ -76153,6 +76481,10 @@ PrefabInstance:
|
|||
propertyPath: m_PlayAutomatically
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6346176042650486547, guid: 59684b397aa758240840f560d3fb71a5, type: 3}
|
||||
propertyPath: m_text
|
||||
value:
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents: []
|
||||
m_RemovedGameObjects: []
|
||||
m_AddedGameObjects: []
|
||||
|
|
@ -78564,6 +78896,10 @@ PrefabInstance:
|
|||
propertyPath: m_PlayAutomatically
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6346176042650486547, guid: 59684b397aa758240840f560d3fb71a5, type: 3}
|
||||
propertyPath: m_text
|
||||
value:
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents: []
|
||||
m_RemovedGameObjects: []
|
||||
m_AddedGameObjects: []
|
||||
|
|
@ -90549,6 +90885,7 @@ MonoBehaviour:
|
|||
i_Chest: {fileID: 1620551539}
|
||||
i_GachaReward: {fileID: 1604177966}
|
||||
slider_charge: {fileID: 419008042}
|
||||
m_GachaLuckyResult: {fileID: 1086019391}
|
||||
gos_effect:
|
||||
- {fileID: 1988220643}
|
||||
- {fileID: 495464323}
|
||||
|
|
@ -92041,7 +92378,7 @@ MonoBehaviour:
|
|||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Material: {fileID: 0}
|
||||
m_Color: {r: 0, g: 0, b: 0, a: 0}
|
||||
m_Color: {r: 0, g: 0, b: 0, a: 0.19607843}
|
||||
m_RaycastTarget: 1
|
||||
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
|
||||
m_Maskable: 1
|
||||
|
|
@ -93854,11 +94191,12 @@ RectTransform:
|
|||
m_GameObject: {fileID: 2091792062}
|
||||
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_LocalScale: {x: 1.25, y: 1.25, z: 1.25}
|
||||
m_ConstrainProportionsScale: 1
|
||||
m_Children:
|
||||
- {fileID: 1546198292}
|
||||
- {fileID: 1022641048}
|
||||
- {fileID: 305452060}
|
||||
- {fileID: 1848876305}
|
||||
m_Father: {fileID: 1086019390}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
|
|
@ -95089,6 +95427,10 @@ PrefabInstance:
|
|||
propertyPath: m_PlayAutomatically
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6346176042650486547, guid: 59684b397aa758240840f560d3fb71a5, type: 3}
|
||||
propertyPath: m_text
|
||||
value:
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents: []
|
||||
m_RemovedGameObjects: []
|
||||
m_AddedGameObjects: []
|
||||
|
|
@ -96735,10 +97077,6 @@ PrefabInstance:
|
|||
propertyPath: m_LocalEulerAnglesHint.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5749544827683741712, guid: 59684b397aa758240840f560d3fb71a5, type: 3}
|
||||
propertyPath: m_PlayAutomatically
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents: []
|
||||
m_RemovedGameObjects: []
|
||||
m_AddedGameObjects: []
|
||||
|
|
|
|||
|
|
@ -1,4 +1,5 @@
|
|||
using TMPro;
|
||||
using TreeEditor;
|
||||
using UnityEngine;
|
||||
using UnityEngine.UI;
|
||||
|
||||
|
|
@ -22,9 +23,17 @@ public class AlbumCard : CardBase
|
|||
{
|
||||
if (m_Data.e_CollectionMethod == eCollectionMethod.Normal)
|
||||
{
|
||||
var preData = table_album.Ins.Get_PreData_orNull(m_Data);
|
||||
gos[0].SetActive(SaveMgr.Ins.IsObtainGirl(m_Data.n_GirlID) && !SaveMgr.Ins.IsOpenAlbum(m_Data) &&
|
||||
(preData == null || SaveMgr.Ins.IsOpenAlbum(preData)));
|
||||
var preDatas = table_album.Ins.Get_PreDatas(m_Data);
|
||||
var existnotopen = false;
|
||||
for (int i = 0; i < preDatas.Count; i++)
|
||||
{
|
||||
if (!SaveMgr.Ins.IsOpenAlbum(preDatas[i]))
|
||||
{
|
||||
existnotopen = true;
|
||||
break;
|
||||
}
|
||||
}
|
||||
gos[0].SetActive(SaveMgr.Ins.IsObtainGirl(m_Data.n_GirlID) && !SaveMgr.Ins.IsOpenAlbum(m_Data) && !existnotopen);
|
||||
}
|
||||
else
|
||||
{
|
||||
|
|
|
|||
|
|
@ -0,0 +1,31 @@
|
|||
using TMPro;
|
||||
using UnityEngine;
|
||||
using UnityEngine.UI;
|
||||
|
||||
public class GachaLuckyResult : AddrHandleBase
|
||||
{
|
||||
public Image i_girl;
|
||||
public GameObject go_reward;
|
||||
public TextMeshProUGUI t_heartamount;
|
||||
|
||||
private void Awake()
|
||||
{
|
||||
t_heartamount.text = table_GlobalValue.Ins.Get_Int("LuckyGachaMaxHeart_Amount").ToString();
|
||||
}
|
||||
|
||||
public void Set(albumtabledata data)
|
||||
{
|
||||
gameObject.SetActive(true);
|
||||
|
||||
if (data != null)
|
||||
{
|
||||
Load_Image(i_girl, data.s_Image);
|
||||
go_reward.SetActive(false);
|
||||
}
|
||||
else
|
||||
{
|
||||
i_girl.enabled = false;
|
||||
go_reward.SetActive(true);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,2 @@
|
|||
fileFormatVersion: 2
|
||||
guid: f2e438ad40ab15e42affa2b84a4562c0
|
||||
|
|
@ -19,6 +19,7 @@ public class GachaUI : uScrollViewMgr
|
|||
public GameObject go_CanEnterLuckyGame, go_autocharge;
|
||||
public Image i_Chest, i_GachaReward;
|
||||
public Slider slider_charge;
|
||||
public GachaLuckyResult m_GachaLuckyResult;
|
||||
|
||||
DateTime GachaAutoRefillTime;
|
||||
float fRefillTime, ToastY = -400f;
|
||||
|
|
@ -166,9 +167,10 @@ public class GachaUI : uScrollViewMgr
|
|||
else SaveMgr.Ins.Add_Money(eMoney.AlbumOpen, table_GlobalValue.Ins.Get_Int("LuckyGachaMaxHeart_Amount"));
|
||||
SaveMgr.Ins.Save();
|
||||
|
||||
// 정인호 : 럭키가챠 UI 노출
|
||||
|
||||
// 럭키가챠 UI 노출 (new)
|
||||
m_GachaLuckyResult.Set(randomalbum);
|
||||
|
||||
// 기존 럭키 게임 (old)
|
||||
//LobbyUI.Ins.m_Game_Lucky.Set();
|
||||
//Set_UI(false);
|
||||
}
|
||||
|
|
@ -271,7 +273,7 @@ public class GachaUI : uScrollViewMgr
|
|||
if (texts_luckypoint[i].alpha <= 0f)
|
||||
{
|
||||
texts_luckypoint[i].text = $"+{reward.Item3}";
|
||||
texts_luckypoint[i].GetComponent<Animation>().Play();
|
||||
texts_luckypoint[i].GetComponent<Animator>().Play("Gacha_LuckyPoint");
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
File diff suppressed because one or more lines are too long
Loading…
Reference in New Issue