From dc24aec03287dd22a96f42aa778b2f1930962330 Mon Sep 17 00:00:00 2001 From: chyoura Date: Sun, 23 Jun 2024 00:16:27 +0900 Subject: [PATCH] 6/23 yura --- Assets/Images/.DS_Store | Bin 18436 -> 10244 bytes Assets/Images/New Animation.anim | 75 + Assets/Images/New Animation.anim.meta | 8 + Assets/Images/title_1 1.controller | 72 + Assets/Images/title_1 1.controller.meta | 8 + Assets/Images/title_1.controller | 72 + Assets/Images/title_1.controller.meta | 8 + .../Demigiant/DOTween/DOTween.sln.meta} | 2 +- Assets/Resources/specialPerson.csv | 40 +- Assets/Scenes 1/Jisu/StartScene.unity | 249 ++- Assets/Scenes 1/Yura/morningScene.unity | 1826 ++++++++++++++--- Assets/Scripts/Jisu/title_1.controller | 72 + Assets/Scripts/Jisu/title_1.controller.meta | 8 + Assets/Scripts/Jisu/touchIcon_1 2.controller | 72 + .../Jisu/touchIcon_1 2.controller.meta | 8 + Assets/Scripts/Jisu/touchh.anim | 191 ++ Assets/Scripts/Jisu/touchh.anim.meta | 8 + Assets/Scripts/Jiyun/Herbbook.cs | 10 + Assets/Scripts/Yura/sellerManage.cs | 67 +- Assets/img_ch/etc_ch/touch.png | Bin 0 -> 876 bytes Assets/img_ch/etc_ch/touch.png.meta | 165 ++ 21 files changed, 2488 insertions(+), 473 deletions(-) create mode 100644 Assets/Images/New Animation.anim create mode 100644 Assets/Images/New Animation.anim.meta create mode 100644 Assets/Images/title_1 1.controller create mode 100644 Assets/Images/title_1 1.controller.meta create mode 100644 Assets/Images/title_1.controller create mode 100644 Assets/Images/title_1.controller.meta rename Assets/{GooglePlayGamesPlugin-0.10.14.unitypackage.meta => Plugins/Demigiant/DOTween/DOTween.sln.meta} (74%) create mode 100644 Assets/Scripts/Jisu/title_1.controller create mode 100644 Assets/Scripts/Jisu/title_1.controller.meta create mode 100644 Assets/Scripts/Jisu/touchIcon_1 2.controller create mode 100644 Assets/Scripts/Jisu/touchIcon_1 2.controller.meta create mode 100644 Assets/Scripts/Jisu/touchh.anim create mode 100644 Assets/Scripts/Jisu/touchh.anim.meta create mode 100644 Assets/img_ch/etc_ch/touch.png create mode 100644 Assets/img_ch/etc_ch/touch.png.meta diff --git a/Assets/Images/.DS_Store b/Assets/Images/.DS_Store index 9949a2959e2d78862f492de1deb77dca606c9d5a..7a9e45021431c90532717106a927709def29b69a 100644 GIT binary patch delta 196 zcmZpfz}ONX!N9=4=v10w$iScgWO4v8h!)_PSSU78Pja$>3yUO>&j3~j6lY-2V<=$A zV@UVR$xq%a$RWnES%IUMnUfKu2&kVMBBsXkl$lXtGLJ&;VSUzMMkax9Xd+=&U?5-pm zVGs#~n_T3m92_Aj65^{M1}A_M6O17V0TM%ECq+5ra+0cq6ja4dTqM7HX4c)a(;|gc zMxu7AW?IwpU;pVh-P`~F`6EII%u`5BdY$fBTOQT` z?s44n5l={xL|fukM>K9lv!rtsIRycxRV+{Jw}F+B4ZCp3ic(tZDB8@u%a zJQkAW#3E^8;xQ3V^>o?uUD*}wikqo)UENVo^70D`i`2k~Vy&cN;T0{57HjSLs2r6gl$PluN1anXdd%3$^Dmh^wehmKZ5>u;r;$jfR>dPxBfh4`zWentY@sP>;4!u` zg?Di^typ5k%#9}2Y%vqDm5E5FaV@RBGLlL!>oO8X?C`kp!E-CL3FocpF;iwVZmf-@ zI*dfjOl(@!YsS)>S0T{Yss=_vjb7wPS5H&}dQ2~HPA|F`PZ#Tj_G!hWT2Iys6 zD(V{osvgnvoYP4&@D%J5ZT6f%Ku_uU&gq0Oo)UIaQPDgfn|V=J)#`BnuNf!R;Y)08 zs$Gg$kE+9U_IUu8h7hSI&E!h50mn}txtDyIJWRev4w4th5%Lx}PTnS`0H74kfpKsl z)IlT6gDYSuEQ96H3aj8+Xon3Dg&1@~0xY;5Qg9<|hnt`uJ^^>bJ#a648a@kOfv>{X z-~o6Pz75}j@4`-a5}ty6@B{cUJP!xq5WECGfnUOJ;g9fFc*nj$g|1L^TVfaP5#BXp zMl_PVdJU3o_0F@p6S36#Rve72_60Sd2HN#8eSLK`l?{zkx7Sqm&8)}2r#4LAzCECh zuAV%5Mf;X`XTrL}ZWCNhC9V#qyc5fOl3;Vj=xI$R;#Oi4)=~L@TTg09C(gh$iEt|@ z&Oikv^WWoUU?J&3ISY?*Vu-S2E+GX8nQXK-<;+yFFWTkk$3iW}LvG74kYgan0M7vZ zeX7KrmSLytw@X?@>#6xbOKL)}4gba;Eml|Qlwqgrw@U^^41;26L&0$|z=mUeB^Adq z?3Dd>X~PNFZ~~5Ia6A-X+7VaD#0iA$GIz`|kYga5fm*B*?0JuUQq0@>G8+Z%_ShZ8 zXbBpm19ubclr-YH(9YQ;S}SnUgVOy`GOg4y60Dsfk|NzCD)(dx-sEf}kF;nV*?!C$ zt{+pR7OU4V+b|tTcclFU+EX<2bJA??2-(bed_wCm+fRw5lS6GoCVCf~=(9M{)3 zrG5t5nN#Zquru$nAD`6D#HT(&n+?`&7;*z+b{G^u{Z zobddXC08A0zM3{#TZdMAB268yq}QEt-7Mz0P^T(zxQw}Ap^)uwod&p~ZQW7x`ffA5 zO|Mo}rlT@cr3vmG`diozdWz?VszSUc=m0JbU8*ss5Ir$luvV+nm{W-UmtE7KO$*sB zCHi)@ox575)LpSj@xC>pxd*MF#5_}z)*VyOoQQ3xn zWly+VIOHQ34jGiOKBU7T*<;yb3TWc;DqEJBF~Bdh0UFf6Wf{X20~i84qBI*J)5eSd z9!s^ExJ$LsAW7j;&Jdv5JP4UKvfG0#B)w>E_?tHvIu-O3^RhAxlsy5Z?l|`HqdUmH zp!hePRu&HlO=hYxTZYNE7E3uBPSsZSi)nLhaT&Qtz+ z7=yfgiC12xi806{3-=x0FX;_6s|hb#%*)C&FvfV4`s^M1*FSUXfyw@Tp`1Y}$61M2 zUZ#n%CLq-V6JLG(xo;l6(O(l~O^`3~%F8rS)&ykXfqQnT5-rG@AY07K$}~{c1XR(% z=2wmlG|u2Ajx$Y^mT6&(@i_HRc>nrm@7UcW=?i6ymoM?k%QP{@cx2#E`nerH+OxND zSDi!`<&8&_W+PB6`4E~&B&=>QeMc&jB5Yd6#n|(W^OwlWC?;LukR<=LUbxbao3kujUL+ zrkS!WwBXe|fGH{9yqYsOnP$qi(1NRZ1wP{lx*C$_%-G)L!*&)t;@fTIpL`Sla2joa`Yt~b4eEFgjHLY=gpgB#xz)c!7r$Ke6GhDFz z61OvADpPRfs+Fs?HZGs&Y@{z?^wpcS&4q$!Uz-j!xx!}Y~Z<*afo=naNn{_$YY6AZ^#xE%~{!fV;V@P%0G9}LHk z{$lKf5DXusk1Pu=53Y~~!`UFiLnat*zii0LE@SCZ7m!ALt-X?L#2>d?$UWpiOqY6= z>?bdiH^}eEpUFSTN%9`X!xhK_4MxLQOq?1IRWKQ*Ks_|T988~TfkhY(Z-aHP9;4z0 z#>C?+eX17|r*6i?sar5E{yDfGz5ri@2U)_@V;B>EjwMRH0I$GN_zg>x`WKvllZv8f zN{Ld+V&XyNT#ScL#(4N#Wr4EL?wJBk57)Xqb?V!&JUxHh*!Ls;^9NG_7q)1Nhy46G zODTXMEt3N1osLclAf1SA3SgBsQN@|zrT|{3U994qa8m$lDr)hKl99Qp>zO#uvPTnb=Q#eDh}iKYO$5BiLT^lRiOIfgla@8S!dLVUHO!+CHK z<^WEIFf4$DIEWX+5?BpuU@Z=1I*>QAS3FxF4c*X-uX%2OPr|M6DYzZ(!~y+z9MW_^ zKLp=^N8nqq3wFaEeBJXjJOlgjb&cO9}C#t;y z%2rHfE!^i?98qirb57_YE_n3A#Qz_Ix1Y)V`!j-`WfvY>&>od}nA9HQTNv~HEy(VM*=2lN1?b!Q+TF}Hd(Rz@ zc;6#VOUhbjW0=RN?_=Ae_aE>GaxsQE>Y_Q?| zvCp84^r4>JB8+5@aafF|UFM@2nJGh!CL!TeNSyVUGiWf$WjT`uKgAiwOR@MNU@q0v z%^%Gz#e=&P56ahw!+a^mC@~ diff --git a/Assets/Images/New Animation.anim b/Assets/Images/New Animation.anim new file mode 100644 index 0000000..1b9e808 --- /dev/null +++ b/Assets/Images/New Animation.anim @@ -0,0 +1,75 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!74 &7400000 +AnimationClip: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: New Animation + serializedVersion: 7 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: [] + m_ScaleCurves: [] + m_FloatCurves: [] + m_PPtrCurves: + - serializedVersion: 2 + curve: + - time: 0 + value: {fileID: 4369572136041557648, guid: 147bc73b31ead304ab1dd97c8e542b78, type: 3} + - time: 0.083333336 + value: {fileID: 3918735734063839423, guid: 147bc73b31ead304ab1dd97c8e542b78, type: 3} + attribute: m_Sprite + path: + classID: 212 + script: {fileID: 0} + flags: 2 + m_SampleRate: 12 + m_WrapMode: 0 + m_Bounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_ClipBindingConstant: + genericBindings: + - serializedVersion: 2 + path: 0 + attribute: 0 + script: {fileID: 0} + typeID: 212 + customType: 23 + isPPtrCurve: 1 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + pptrCurveMapping: + - {fileID: 4369572136041557648, guid: 147bc73b31ead304ab1dd97c8e542b78, type: 3} + - {fileID: 3918735734063839423, guid: 147bc73b31ead304ab1dd97c8e542b78, type: 3} + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 0.16666667 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_HasAdditiveReferencePose: 0 + m_LoopTime: 1 + m_LoopBlend: 0 + m_LoopBlendOrientation: 0 + m_LoopBlendPositionY: 0 + m_LoopBlendPositionXZ: 0 + m_KeepOriginalOrientation: 0 + m_KeepOriginalPositionY: 1 + m_KeepOriginalPositionXZ: 0 + m_HeightFromFeet: 0 + m_Mirror: 0 + m_EditorCurves: [] + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: [] diff --git a/Assets/Images/New Animation.anim.meta b/Assets/Images/New Animation.anim.meta new file mode 100644 index 0000000..16cd31f --- /dev/null +++ b/Assets/Images/New Animation.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 633454f12857646b3bcbff1fa140954f +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Images/title_1 1.controller b/Assets/Images/title_1 1.controller new file mode 100644 index 0000000..3bddcff --- /dev/null +++ b/Assets/Images/title_1 1.controller @@ -0,0 +1,72 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1107 &-4589429630435294697 +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: 3783168237068035303} + m_Position: {x: 200, y: 0, 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: 3783168237068035303} +--- !u!91 &9100000 +AnimatorController: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: title_1 1 + serializedVersion: 5 + m_AnimatorParameters: [] + m_AnimatorLayers: + - serializedVersion: 5 + m_Name: Base Layer + m_StateMachine: {fileID: -4589429630435294697} + 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!1102 &3783168237068035303 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: New Animation + 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: 633454f12857646b3bcbff1fa140954f, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: diff --git a/Assets/Images/title_1 1.controller.meta b/Assets/Images/title_1 1.controller.meta new file mode 100644 index 0000000..5226064 --- /dev/null +++ b/Assets/Images/title_1 1.controller.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: f3b49ce2b1dcc41aba6e550b8b3c24dd +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 9100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Images/title_1.controller b/Assets/Images/title_1.controller new file mode 100644 index 0000000..f91133b --- /dev/null +++ b/Assets/Images/title_1.controller @@ -0,0 +1,72 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1107 &-7914553842353672298 +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: 4718177790708149959} + m_Position: {x: 200, y: 0, 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: 4718177790708149959} +--- !u!91 &9100000 +AnimatorController: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: title_1 + serializedVersion: 5 + m_AnimatorParameters: [] + m_AnimatorLayers: + - serializedVersion: 5 + m_Name: Base Layer + m_StateMachine: {fileID: -7914553842353672298} + 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!1102 &4718177790708149959 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: New Animation + 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: 633454f12857646b3bcbff1fa140954f, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: diff --git a/Assets/Images/title_1.controller.meta b/Assets/Images/title_1.controller.meta new file mode 100644 index 0000000..cfb1162 --- /dev/null +++ b/Assets/Images/title_1.controller.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: a2a557dd0bb714f62a98199a0873ad21 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 9100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/GooglePlayGamesPlugin-0.10.14.unitypackage.meta b/Assets/Plugins/Demigiant/DOTween/DOTween.sln.meta similarity index 74% rename from Assets/GooglePlayGamesPlugin-0.10.14.unitypackage.meta rename to Assets/Plugins/Demigiant/DOTween/DOTween.sln.meta index d91f1bb..662f931 100644 --- a/Assets/GooglePlayGamesPlugin-0.10.14.unitypackage.meta +++ b/Assets/Plugins/Demigiant/DOTween/DOTween.sln.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 9e93e381041b69f41a4b4b776e4ec2eb +guid: df689acd4767344f3afb6d7e5c2f39d9 DefaultImporter: externalObjects: {} userData: diff --git a/Assets/Resources/specialPerson.csv b/Assets/Resources/specialPerson.csv index 7723bef..082a388 100644 --- a/Assets/Resources/specialPerson.csv +++ b/Assets/Resources/specialPerson.csv @@ -1,26 +1,26 @@ num,choice,person,content,kind,choice1,choice2,choice3 1,n,herbGranpaA,새롭게 가게를 열었구만. 반갑네.,granpa,,, 2,n,herbGranpaA,"마침 다치는 사람이 많은 동넨데, 물약가게가 생기니 좋구먼.",granpa,,, -3,y,herbGranpaA,가게를 연건 이번이 처음인가?,granpa,"네, 맞아요!",그걸 알아서 뭐하게요;,none -4,n,herbGranpaA,흠! ,granpa,,, -5,n,herbGranpaA,처음인 너를 위해서 하는 말이니 새겨듣거라.,granpa,,, -6,n,herbGranpaA,처음이니 가게 운영이 많이 어려울 거야.,granpa,,, -7,n,herbGranpaA,몇 가지 알아야 할 점을 알려주겠네.,granpa,,, -8,n,herbGranpaA,"약초꾼들을 항상 조심하고, 그들이 파는 약초를 눈여겨 봐야 해.",granpa,,, -9,n,herbGranpaA,"진짜를 팔 수도 있고, 가짜 약초르 팔 수도 있기 때문이야.",granpa,,, -10,n,herbGranpaA,음? 어떻게 진짜 약초인지 아냐고?,granpa,,, -11,n,herbGranpaA,아마 전임자가 두고 간 약초 노트가 있을거야. 그걸 참고해.,granpa,,, -12,n,herbGranpaA,지금은 아마 첫 장 밖에 없을거야. 그것도 중요한 지식재산이라 전임자가 다 뜯어갔을걸.,granpa,,, -13,n,herbGranpaA,그래도 걱정 말게. 새로운 약초 종류가 생길때마다 내가 와서 대략적인 정보를 줄테니..그 정보로 자네만의 약초노트를 추가하게나.,granpa,,, -14,n,herbGranpaA,이 지역은 이슬산딸기가 주 생산 약초야.,granpa,,, -15,n,herbGranpaA,"남녀노소 누구나 좋아하는 약초고, 사람을 치료하는데 많이 쓰여.",granpa,,, -16,n,herbGranpaA,"약초노트의 약초 설명을 자세히 잘 읽고, 그걸 토대로 손님이 요구하는 물약을 만들어봐.",granpa,,, -17,n,herbGranpaA,"약초마다 질긴 정도, 수분 함량에 따라 제조 시간, 화력도 달라져야 한다네.",granpa,,, -18,n,herbGranpaA,"가짜 약초로 만들거나, 원하는 물약을 만들어 주지 않거나, 제조 방법이 잘못됐거나 하면...",granpa,,, -19,n,herbGranpaA,손님들이 싫어할테니 잘 만들어 보게나.,granpa,,, -20,n,herbGranpaA,그래도 이 정도의 실수는 조금씩 양해해 주지만..아예 엉뚱한 물약을 줘버리면.,granpa,,, -21,n,herbGranpaA,"그건 ""물약사""로서 용납되지 않는 행동이니 조심하게나.",granpa,,, -22,n,herbGranpaA,"그럼, 무운을 비네!",granpa,,, +3,y,herbGranpaA,가게를 연건 이번이 처음인가?,granpa,"네, 맞아요!","아니요.",none +4,n,herbGranpaA,"그러면, 약초 가게를 어떻게 운영하는지 알려주겠네.",granpa,,, +5,n,herbGranpaA,아침엔 이제 여러 명의 상인들이 자네에게 약초를 팔러 오지.,granpa,,, +6,n,herbGranpaA,"주의할 점은, 그중 사기꾼이 섞여 있다는 게야.",granpa,,, +7,n,herbGranpaA,가짜 약초를 파는 놈들을 항상 조심해.,granpa,,, +8,n,herbGranpaA,"으응? 어떻게 가짜고 어떤게 진짠지 구별하냐고?",granpa,,, +9,n,herbGranpaA,"여기,약초 노트를 쭉 정독해봐.",granpa,,, +10,n,herbGranpaA,"약초의 속성, 더 자세한 가게 운영 방법 등..자네에게 피와 살이 될 지식들이 쭉 적혀있지.",granpa,,, +11,n,herbGranpaA,네가 진짜 약초를 파는 상인과 계약을 잘 성사했다고 생각하면 다른 상인들을 볼 필요 없이 바로 가게 문을 열어도 상관 없다네!,granpa,,, +12,n,herbGranpaA,그럴땐 이 시계 버튼을 누르면 돼. 손님들이 오기 시작할거야.,granpa,,, +13,n,herbGranpaA,"이 지역은 '이슬산딸기'가 주 생산 약초야.",granpa,,, +14,n,herbGranpaA,"남녀노소 누구나 좋아하는 약초고, 사람을 치료하는데 많이 쓰여.",granpa,,, +15,n,herbGranpaA,"약초노트의 약초 설명을 자세히 잘 읽고, 그걸 토대로 손님이 요구하는 물약을 만들어봐.",granpa,,, +16,n,herbGranpaA,"약초마다 질긴 정도, 수분 함량에 따라 제조방법도 달라져야 한다네.",granpa,,, +17,n,herbGranpaA,"가짜 약초가 재료로 들어가거나,제조 방법이 잘못됐거나,원하는 조미료를 넣어주지 않으면..",granpa,,, +18,n,herbGranpaA,손님들이 꽤나 싫어할테지.,granpa,,, +19,n,herbGranpaA,"아예 엉뚱한 물약을 줘버리면 손님들은 제값을 주지도 않을테니 그걸 제일 조심하게나.",granpa,,, +20,n,herbGranpaA,무운을 비네! 새 약초가 공급되면 내 또 와서 알려주지.,granpa,,, +21,n,herbGranpaA-1,"오! 그러면 별다른 설명이 필요 없겠구만.",granpa,,, +22,n,herbGranpaA-1,"그럼, 무운을 비네!",granpa,,, 23,n,herbGranpaB,안녕하신가!,granpa,진짜요?,우오ㅏ.,none 24,n,herbGranpaB,오랜만이네. 가게가 잘 운영되고 있는 것 같은데..,granpa,,, 25,n,herbGranpaB,"아, 내가 온 이유는.. 선물이 있어서 말이네.",granpa,,, diff --git a/Assets/Scenes 1/Jisu/StartScene.unity b/Assets/Scenes 1/Jisu/StartScene.unity index 2ad9aea..9e21776 100644 --- a/Assets/Scenes 1/Jisu/StartScene.unity +++ b/Assets/Scenes 1/Jisu/StartScene.unity @@ -5037,7 +5037,7 @@ Transform: m_GameObject: {fileID: 340613634} serializedVersion: 2 m_LocalRotation: {x: -0.7071068, y: 0, z: 0, w: 0.7071068} - m_LocalPosition: {x: 1.75, y: -0.41, z: -0} + m_LocalPosition: {x: 1.75, y: -0.41, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -5409,6 +5409,115 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &835897477 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 835897480} + - component: {fileID: 835897479} + - component: {fileID: 835897481} + m_Layer: 0 + m_Name: title_1 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!212 &835897479 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 835897477} + 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_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + 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: 1 + m_Sprite: {fileID: 3918735734063839423, guid: 147bc73b31ead304ab1dd97c8e542b78, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 8.93, y: 5.2} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!4 &835897480 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 835897477} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0.05, y: 2.54, z: 0} + m_LocalScale: {x: 0.5, y: 0.5, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!95 &835897481 +Animator: + serializedVersion: 7 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 835897477} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: 85c5f6cd2bd91422687ca87a1ea80bfb, type: 2} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_StabilizeFeet: 0 + m_AnimatePhysics: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorStateOnDisable: 0 + m_WriteDefaultValuesOnDisable: 0 --- !u!1 &846736857 GameObject: m_ObjectHideFlags: 0 @@ -5561,12 +5670,20 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 +<<<<<<< Updated upstream m_fontSize: 45 +======= + m_fontSize: 43.75 +>>>>>>> Stashed changes m_fontSizeBase: 45 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 18 +<<<<<<< Updated upstream m_fontSizeMax: 72 +======= + m_fontSizeMax: 75 +>>>>>>> Stashed changes m_fontStyle: 0 m_HorizontalAlignment: 2 m_VerticalAlignment: 512 @@ -5599,7 +5716,11 @@ MonoBehaviour: m_VertexBufferAutoSizeReduction: 0 m_useMaxVisibleDescender: 1 m_pageToDisplay: 1 +<<<<<<< Updated upstream m_margin: {x: 0, y: 0, z: 0, w: 0} +======= + m_margin: {x: 14.779747, y: 10.298218, z: 13.335854, w: 11.44245} +>>>>>>> Stashed changes m_isUsingLegacyAnimationComponent: 0 m_isVolumetricText: 0 m_hasFontAssetChanged: 0 @@ -6046,7 +6167,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: conStartResult: {fileID: 479297684} - title: {fileID: 2004304100} + title: {fileID: 0} click: {fileID: 1560733067} --- !u!4 &1560733066 Transform: @@ -6375,115 +6496,6 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &2004304100 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 2004304102} - - component: {fileID: 2004304101} - - component: {fileID: 2004304103} - m_Layer: 0 - m_Name: title1_0 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!212 &2004304101 -SpriteRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2004304100} - 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_RayTracingAccelStructBuildFlagsOverride: 0 - m_RayTracingAccelStructBuildFlags: 1 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} - 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: 10 - m_Sprite: {fileID: 3918735734063839423, guid: 147bc73b31ead304ab1dd97c8e542b78, type: 3} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_FlipX: 0 - m_FlipY: 0 - m_DrawMode: 0 - m_Size: {x: 11.11, y: 6.56} - m_AdaptiveModeThreshold: 0.5 - m_SpriteTileMode: 0 - m_WasSpriteAssigned: 1 - m_MaskInteraction: 0 - m_SpriteSortPoint: 0 ---- !u!4 &2004304102 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2004304100} - serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 2.5, z: 0} - m_LocalScale: {x: 0.5, y: 0.5, z: 0.5} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!95 &2004304103 -Animator: - serializedVersion: 7 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2004304100} - m_Enabled: 1 - m_Avatar: {fileID: 0} - m_Controller: {fileID: 9100000, guid: 77c9fa9adcf084842b08517d178a15e3, type: 2} - m_CullingMode: 0 - m_UpdateMode: 0 - m_ApplyRootMotion: 0 - m_LinearVelocityBlending: 0 - m_StabilizeFeet: 0 - m_AnimatePhysics: 0 - m_WarningMessage: - m_HasTransformHierarchy: 1 - m_AllowConstantClipSamplingOptimization: 1 - m_KeepAnimatorStateOnDisable: 0 - m_WriteDefaultValuesOnDisable: 0 --- !u!1 &2096047927 GameObject: m_ObjectHideFlags: 0 @@ -6568,12 +6580,21 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 +<<<<<<< Updated upstream m_fontSize: 45 m_fontSizeBase: 45 +======= + m_fontSize: 42.9 + m_fontSizeBase: 60 +>>>>>>> Stashed changes m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 18 +<<<<<<< Updated upstream m_fontSizeMax: 72 +======= + m_fontSizeMax: 75 +>>>>>>> Stashed changes m_fontStyle: 0 m_HorizontalAlignment: 2 m_VerticalAlignment: 512 @@ -6606,7 +6627,11 @@ MonoBehaviour: m_VertexBufferAutoSizeReduction: 0 m_useMaxVisibleDescender: 1 m_pageToDisplay: 1 +<<<<<<< Updated upstream m_margin: {x: 0, y: 0, z: 0, w: 0} +======= + m_margin: {x: 14.844337, y: 10.305962, z: 16.288246, w: 11.336575} +>>>>>>> Stashed changes m_isUsingLegacyAnimationComponent: 0 m_isVolumetricText: 0 m_hasFontAssetChanged: 0 @@ -6627,10 +6652,10 @@ SceneRoots: - {fileID: 324613274} - {fileID: 539566656} - {fileID: 340613637} + - {fileID: 835897480} - {fileID: 752971238} - {fileID: 846736860} - {fileID: 1560733066} - - {fileID: 2004304102} - {fileID: 1869554008} - {fileID: 817483844} - {fileID: 1971605108} diff --git a/Assets/Scenes 1/Yura/morningScene.unity b/Assets/Scenes 1/Yura/morningScene.unity index 679dbfc..a249725 100644 --- a/Assets/Scenes 1/Yura/morningScene.unity +++ b/Assets/Scenes 1/Yura/morningScene.unity @@ -1000,6 +1000,279 @@ SpriteRenderer: m_WasSpriteAssigned: 0 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +<<<<<<< Updated upstream +======= +--- !u!1 &148969556 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 148969557} + - component: {fileID: 148969560} + - component: {fileID: 148969559} + - component: {fileID: 148969558} + m_Layer: 5 + m_Name: touchIcon_2 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &148969557 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 148969556} + 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: 1236872181} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.82900006, y: 0.30827522} + m_AnchorMax: {x: 1, y: 0.42700002} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!95 &148969558 +Animator: + serializedVersion: 7 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 148969556} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: a2297a59dc81f4b38b18c07e467c25a2, type: 2} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_StabilizeFeet: 0 + m_AnimatePhysics: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorStateOnDisable: 0 + m_WriteDefaultValuesOnDisable: 0 +--- !u!114 &148969559 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 148969556} + 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: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 2963885364918429243, guid: 39cad6bff01104e1d88fe7c761b20975, 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 &148969560 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 148969556} + m_CullTransparentMesh: 1 +--- !u!1 &157032056 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 157032057} + - component: {fileID: 157032059} + - component: {fileID: 157032058} + m_Layer: 5 + m_Name: Text (TMP) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &157032057 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 157032056} + m_LocalRotation: {x: 0, y: 0, z: 0.7071068, w: 0.7071068} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1504560919} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 90} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 334, y: 32} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &157032058 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 157032056} + 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: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: " \uAE30\uD0C0" + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: d8d8551b2f264664992785b16876aa47, type: 2} + m_sharedMaterial: {fileID: 887919620621015924, guid: d8d8551b2f264664992785b16876aa47, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4278190080 + m_fontColor: {r: 0, g: 0, b: 0, 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: 600 + m_fontSizeBase: 600 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 32 + m_VerticalAlignment: 512 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_TextWrappingMode: 1 + 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: 614.4458, y: 0, z: 677.70306, 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 &157032059 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 157032056} + m_CullTransparentMesh: 1 +--- !u!1 &192754858 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 192754859} + m_Layer: 5 + m_Name: Fill Area + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &192754859 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 192754858} + 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: 595298685} + m_Father: {fileID: 458877426} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0.25} + m_AnchorMax: {x: 1, y: 0.75} + m_AnchoredPosition: {x: -5, y: 0} + m_SizeDelta: {x: -20, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +>>>>>>> Stashed changes --- !u!1 &238247762 GameObject: m_ObjectHideFlags: 0 @@ -1204,61 +1477,163 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} ---- !u!1 &311339871 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 311339872} - - component: {fileID: 311339873} - - component: {fileID: 311339874} - m_Layer: 5 - m_Name: Img4 (2) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &311339872 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 311339871} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 2, y: 2, z: 2} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 1189550553} - 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: -160.00006, y: -251.75336} - m_SizeDelta: {x: 74.9939, y: 72.4932} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &311339873 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 311339871} - m_CullTransparentMesh: 1 ---- !u!114 &311339874 +<<<<<<< Updated upstream +======= +--- !u!114 &291925718 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 311339871} + m_GameObject: {fileID: 291925716} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + 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: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: "\uC77C" + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: d8d8551b2f264664992785b16876aa47, type: 2} + m_sharedMaterial: {fileID: 887919620621015924, guid: d8d8551b2f264664992785b16876aa47, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4278190080 + m_fontColor: {r: 0, g: 0, b: 0, 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: 20.55 + m_fontSizeBase: 36 + m_fontWeight: 400 + m_enableAutoSizing: 1 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 256 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_TextWrappingMode: 1 + 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 &291925719 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 291925716} + m_CullTransparentMesh: 1 +>>>>>>> Stashed changes +--- !u!1 &311339871 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 311339872} + - component: {fileID: 311339873} + - component: {fileID: 311339874} + m_Layer: 5 + m_Name: Img4 (2) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &311339872 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 311339871} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 2, y: 2, z: 2} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1189550553} + 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: -160.00006, y: -251.75336} + m_SizeDelta: {x: 74.9939, y: 72.4932} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &311339873 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 311339871} + m_CullTransparentMesh: 1 +--- !u!114 &311339874 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 311339871} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} @@ -1708,7 +2083,433 @@ MonoBehaviour: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 427424997} + m_GameObject: {fileID: 427424997} + 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: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: "\uC190\uB2D8 \uB300\uD654\uCC3D" + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: b923b5c1ca42740a5922a39dd1a67bb0, type: 2} + m_sharedMaterial: {fileID: 3064797930217198149, guid: b923b5c1ca42740a5922a39dd1a67bb0, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4292467161 + m_fontColor: {r: 0.8490566, g: 0.8490566, b: 0.8490566, 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: 28 + m_fontSizeBase: 28 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 1 + m_HorizontalAlignment: 1 + m_VerticalAlignment: 512 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_TextWrappingMode: 1 + 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: 19.933372, z: 0, w: 45.846962} + 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 &427425000 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 427424997} + m_CullTransparentMesh: 1 +--- !u!114 &427425001 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 427424997} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0a32555f37d09419babf9d37e84579e7, type: 3} + m_Name: + m_EditorClassIdentifier: + CharperSeconds: 10 + targetMsg: + EndCursor: {fileID: 545237291} +--- !u!1 &446724017 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 446724020} + - component: {fileID: 446724019} + - component: {fileID: 446724018} + m_Layer: 5 + m_Name: Img3 (3) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &446724018 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 446724017} + 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: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 0} + 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 &446724019 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 446724017} + m_CullTransparentMesh: 1 +--- !u!224 &446724020 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 446724017} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 2, y: 2, z: 2} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1514564302} + 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: 136, y: -247.00002} + m_SizeDelta: {x: 74.9939, y: 72.4932} + m_Pivot: {x: 0.5, y: 0.5} +<<<<<<< Updated upstream +======= +--- !u!1 &458877425 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 458877426} + - component: {fileID: 458877428} + - component: {fileID: 458877427} + m_Layer: 5 + m_Name: Slider + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &458877426 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 458877425} + 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: 510077748} + - {fileID: 192754859} + m_Father: {fileID: 1082638388} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0.7675888} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &458877427 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 458877425} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 6f3ff8f13e8ff421f8da4d7912a81bf5, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &458877428 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 458877425} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 67db9e8f0e2ae9c40bc1e2b64352a6b4, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_WrapAround: 0 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 0} + m_FillRect: {fileID: 595298685} + m_HandleRect: {fileID: 0} + m_Direction: 0 + m_MinValue: 0 + m_MaxValue: 100 + m_WholeNumbers: 0 + m_Value: 100 + m_OnValueChanged: + m_PersistentCalls: + m_Calls: [] +>>>>>>> Stashed changes +--- !u!1 &464276830 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 464276831} + - component: {fileID: 464276832} + - component: {fileID: 464276833} + m_Layer: 5 + m_Name: Img1 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &464276831 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 464276830} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 3, y: 3, z: 3} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 889508276} + 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: -61.69409, y: -169} + m_SizeDelta: {x: 74.9939, y: 72.4932} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &464276832 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 464276830} + m_CullTransparentMesh: 1 +--- !u!114 &464276833 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 464276830} + 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: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 0} + 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!1 &499534149 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 499534150} + m_Layer: 5 + m_Name: day2 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &499534150 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 499534149} + 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: 1439252112} + - {fileID: 988630829} + - {fileID: 1615487811} + - {fileID: 594131216} + m_Father: {fileID: 1875736227} + 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: -3, y: 0} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &510093823 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 510093826} + - component: {fileID: 510093825} + - component: {fileID: 510093824} + m_Layer: 5 + m_Name: htext + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &510093824 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 510093823} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} @@ -1722,17 +2523,17 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: "\uC190\uB2D8 \uB300\uD654\uCC3D" + m_text: m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: b923b5c1ca42740a5922a39dd1a67bb0, type: 2} - m_sharedMaterial: {fileID: 3064797930217198149, guid: b923b5c1ca42740a5922a39dd1a67bb0, type: 2} + m_fontAsset: {fileID: 11400000, guid: 99df948673409d64e8fca7b67bfc6448, type: 2} + m_sharedMaterial: {fileID: 2208868013397448131, guid: 99df948673409d64e8fca7b67bfc6448, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] m_fontColor32: serializedVersion: 2 - rgba: 4292467161 - m_fontColor: {r: 0.8490566, g: 0.8490566, b: 0.8490566, a: 1} + rgba: 4278190080 + m_fontColor: {r: 0, g: 0, b: 0, a: 1} m_enableVertexGradient: 0 m_colorMode: 3 m_fontColorGradient: @@ -1749,14 +2550,14 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 28 - m_fontSizeBase: 28 + m_fontSize: 700 + m_fontSizeBase: 700 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 18 m_fontSizeMax: 72 - m_fontStyle: 1 - m_HorizontalAlignment: 1 + m_fontStyle: 0 + m_HorizontalAlignment: 2 m_VerticalAlignment: 512 m_textAlignment: 65535 m_characterSpacing: 0 @@ -1787,36 +2588,40 @@ MonoBehaviour: m_VertexBufferAutoSizeReduction: 0 m_useMaxVisibleDescender: 1 m_pageToDisplay: 1 - m_margin: {x: 0, y: 19.933372, z: 0, w: 45.846962} + m_margin: {x: -0.9805508, y: 0, z: -0.16923523, 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 &427425000 +--- !u!222 &510093825 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 427424997} + m_GameObject: {fileID: 510093823} m_CullTransparentMesh: 1 ---- !u!114 &427425001 -MonoBehaviour: +--- !u!224 &510093826 +RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 427424997} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 0a32555f37d09419babf9d37e84579e7, type: 3} - m_Name: - m_EditorClassIdentifier: - CharperSeconds: 10 - targetMsg: - EndCursor: {fileID: 545237291} ---- !u!1 &446724017 + m_GameObject: {fileID: 510093823} + 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: 1132996215} + 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.075684, y: -8392} + m_SizeDelta: {x: 792.54, y: 1225.6} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &511038181 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -1824,23 +2629,42 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 446724020} - - component: {fileID: 446724019} - - component: {fileID: 446724018} + - component: {fileID: 511038182} + - component: {fileID: 511038184} + - component: {fileID: 511038183} m_Layer: 5 - m_Name: Img3 (3) + m_Name: Image (4) m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!114 &446724018 +--- !u!224 &511038182 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 511038181} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0.99998754, y: 0.99998754, z: 0.99998754} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1189550553} + 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: -152, y: -330} + m_SizeDelta: {x: 200, y: 40} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &511038183 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 446724017} + m_GameObject: {fileID: 511038181} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} @@ -1854,7 +2678,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 0} + m_Sprite: {fileID: -8390296872155013593, guid: c4af2714f9d8a46b394125b670e13908, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -1864,34 +2688,15 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 ---- !u!222 &446724019 +--- !u!222 &511038184 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 446724017} + m_GameObject: {fileID: 511038181} m_CullTransparentMesh: 1 ---- !u!224 &446724020 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 446724017} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 2, y: 2, z: 2} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 1514564302} - 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: 136, y: -247.00002} - m_SizeDelta: {x: 74.9939, y: 72.4932} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!1 &464276830 +--- !u!1 &514039218 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -1899,64 +2704,114 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 464276831} - - component: {fileID: 464276832} - - component: {fileID: 464276833} + - component: {fileID: 514039219} + - component: {fileID: 514039222} + - component: {fileID: 514039221} + - component: {fileID: 514039220} m_Layer: 5 - m_Name: Img1 + m_Name: choice2 m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &464276831 +--- !u!224 &514039219 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 464276830} + m_GameObject: {fileID: 514039218} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 3, y: 3, z: 3} m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 889508276} + m_Children: + - {fileID: 1324021338} + m_Father: {fileID: 286013641} 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: -61.69409, y: -169} - m_SizeDelta: {x: 74.9939, y: 72.4932} + m_AnchoredPosition: {x: 5, y: -324} + m_SizeDelta: {x: 130, y: 25} m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &464276832 -CanvasRenderer: +--- !u!114 &514039220 +MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 464276830} - m_CullTransparentMesh: 1 ---- !u!114 &464276833 + m_GameObject: {fileID: 514039218} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_WrapAround: 0 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 514039221} + m_OnClick: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 1963030526} + m_TargetAssemblyTypeName: sellerManage, Assembly-CSharp + m_MethodName: Btn2 + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 +--- !u!114 &514039221 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 464276830} + m_GameObject: {fileID: 514039218} 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_Color: {r: 0.8018868, g: 0.8018868, b: 0.8018868, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 0} + m_Sprite: {fileID: 2530564911472380330, guid: f0c10e98db8e52a4a9571c7489a93b4b, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -1966,7 +2821,17 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 ---- !u!1 &499534149 +--- !u!222 &514039222 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 514039218} + m_CullTransparentMesh: 1 +<<<<<<< Updated upstream +======= +--- !u!1 &538200705 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -1974,62 +2839,42 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 499534150} + - component: {fileID: 538200706} + - component: {fileID: 538200708} + - component: {fileID: 538200707} m_Layer: 5 - m_Name: day2 + m_Name: touchIconText m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &499534150 +--- !u!224 &538200706 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 499534149} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_GameObject: {fileID: 538200705} + 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: 1439252112} - - {fileID: 988630829} - - {fileID: 1615487811} - - {fileID: 594131216} - m_Father: {fileID: 1875736227} - 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: -3, y: 0} - m_SizeDelta: {x: 100, y: 100} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!1 &510093823 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 510093826} - - component: {fileID: 510093825} - - component: {fileID: 510093824} - m_Layer: 5 - m_Name: htext - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!114 &510093824 + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 544814221} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 0.24000001} + m_AnchoredPosition: {x: 0, y: 0.0000076293945} + m_SizeDelta: {x: 0, y: -0.000015258789} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &538200707 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 510093823} + m_GameObject: {fileID: 538200705} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} @@ -2043,17 +2888,17 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: + m_text: Touch! m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 99df948673409d64e8fca7b67bfc6448, type: 2} - m_sharedMaterial: {fileID: 2208868013397448131, guid: 99df948673409d64e8fca7b67bfc6448, type: 2} + m_fontAsset: {fileID: 11400000, guid: d8d8551b2f264664992785b16876aa47, type: 2} + m_sharedMaterial: {fileID: 887919620621015924, guid: d8d8551b2f264664992785b16876aa47, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] m_fontColor32: serializedVersion: 2 - rgba: 4278190080 - m_fontColor: {r: 0, g: 0, b: 0, a: 1} + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} m_enableVertexGradient: 0 m_colorMode: 3 m_fontColorGradient: @@ -2070,15 +2915,15 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 700 - m_fontSizeBase: 700 + m_fontSize: 26.95 + m_fontSizeBase: 36 m_fontWeight: 400 - m_enableAutoSizing: 0 + m_enableAutoSizing: 1 m_fontSizeMin: 18 m_fontSizeMax: 72 m_fontStyle: 0 m_HorizontalAlignment: 2 - m_VerticalAlignment: 512 + m_VerticalAlignment: 256 m_textAlignment: 65535 m_characterSpacing: 0 m_wordSpacing: 0 @@ -2108,40 +2953,21 @@ MonoBehaviour: m_VertexBufferAutoSizeReduction: 0 m_useMaxVisibleDescender: 1 m_pageToDisplay: 1 - m_margin: {x: -0.9805508, y: 0, z: -0.16923523, w: 0} + m_margin: {x: 0, y: 0, z: 0.15875244, 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 &510093825 +--- !u!222 &538200708 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 510093823} + m_GameObject: {fileID: 538200705} m_CullTransparentMesh: 1 ---- !u!224 &510093826 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 510093823} - 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: 1132996215} - 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.075684, y: -8392} - m_SizeDelta: {x: 792.54, y: 1225.6} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!1 &511038181 +--- !u!1 &540131552 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -2149,42 +2975,23 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 511038182} - - component: {fileID: 511038184} - - component: {fileID: 511038183} + - component: {fileID: 540131555} + - component: {fileID: 540131554} + - component: {fileID: 540131553} m_Layer: 5 - m_Name: Image (4) + m_Name: upDesk m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &511038182 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 511038181} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0.99998754, y: 0.99998754, z: 0.99998754} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 1189550553} - 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: -152, y: -330} - m_SizeDelta: {x: 200, y: 40} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &511038183 +--- !u!114 &540131553 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 511038181} + m_GameObject: {fileID: 540131552} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} @@ -2198,7 +3005,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: -8390296872155013593, guid: c4af2714f9d8a46b394125b670e13908, type: 3} + m_Sprite: {fileID: 7767490506538841015, guid: 95270e594cd904de0bdd90ee29339a39, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -2208,15 +3015,34 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 ---- !u!222 &511038184 +--- !u!222 &540131554 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 511038181} + m_GameObject: {fileID: 540131552} m_CullTransparentMesh: 1 ---- !u!1 &514039218 +--- !u!224 &540131555 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 540131552} + 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: 1236872181} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 0.6} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &544814220 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -2224,131 +3050,36 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 514039219} - - component: {fileID: 514039222} - - component: {fileID: 514039221} - - component: {fileID: 514039220} + - component: {fileID: 544814221} m_Layer: 5 - m_Name: choice2 + m_Name: touchIcon_1 m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &514039219 +--- !u!224 &544814221 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 514039218} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_GameObject: {fileID: 544814220} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 3, y: 3, z: 3} + m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 1324021338} - m_Father: {fileID: 286013641} + - {fileID: 538200706} + - {fileID: 950625338} + m_Father: {fileID: 1236872181} 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: 5, y: -324} - m_SizeDelta: {x: 130, y: 25} + m_AnchorMin: {x: 0.39553803, y: 0.14541127} + m_AnchorMax: {x: 0.6131535, y: 0.2816422} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &514039220 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 514039218} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Navigation: - m_Mode: 3 - m_WrapAround: 0 - m_SelectOnUp: {fileID: 0} - m_SelectOnDown: {fileID: 0} - m_SelectOnLeft: {fileID: 0} - m_SelectOnRight: {fileID: 0} - m_Transition: 1 - m_Colors: - m_NormalColor: {r: 1, g: 1, b: 1, a: 1} - m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} - m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} - m_ColorMultiplier: 1 - m_FadeDuration: 0.1 - m_SpriteState: - m_HighlightedSprite: {fileID: 0} - m_PressedSprite: {fileID: 0} - m_SelectedSprite: {fileID: 0} - m_DisabledSprite: {fileID: 0} - m_AnimationTriggers: - m_NormalTrigger: Normal - m_HighlightedTrigger: Highlighted - m_PressedTrigger: Pressed - m_SelectedTrigger: Selected - m_DisabledTrigger: Disabled - m_Interactable: 1 - m_TargetGraphic: {fileID: 514039221} - m_OnClick: - m_PersistentCalls: - m_Calls: - - m_Target: {fileID: 1963030526} - m_TargetAssemblyTypeName: sellerManage, Assembly-CSharp - m_MethodName: Btn2 - m_Mode: 1 - m_Arguments: - m_ObjectArgument: {fileID: 0} - m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine - m_IntArgument: 0 - m_FloatArgument: 0 - m_StringArgument: - m_BoolArgument: 0 - m_CallState: 2 ---- !u!114 &514039221 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 514039218} - 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: 0.8018868, g: 0.8018868, b: 0.8018868, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 2530564911472380330, guid: f0c10e98db8e52a4a9571c7489a93b4b, 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 &514039222 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 514039218} - m_CullTransparentMesh: 1 +>>>>>>> Stashed changes --- !u!1 &545237291 GameObject: m_ObjectHideFlags: 0 @@ -2500,8 +3231,77 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 0} - m_Type: 0 + m_Sprite: {fileID: 0} + 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 +<<<<<<< Updated upstream +======= +--- !u!1 &595298684 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 595298685} + - component: {fileID: 595298687} + - component: {fileID: 595298686} + m_Layer: 5 + m_Name: Fill + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &595298685 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 595298684} + 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: 192754859} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0.3999939, y: -0.5} + m_SizeDelta: {x: -13, y: 1} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &595298686 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 595298684} + 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: 0, b: 0, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -2510,6 +3310,15 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!222 &595298687 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 595298684} + m_CullTransparentMesh: 1 +>>>>>>> Stashed changes --- !u!1 &597855802 GameObject: m_ObjectHideFlags: 0 @@ -3007,7 +3816,11 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 +<<<<<<< Updated upstream m_fontSize: 15 +======= + m_fontSize: 28.05 +>>>>>>> Stashed changes m_fontSizeBase: 15 m_fontWeight: 400 m_enableAutoSizing: 0 @@ -3913,6 +4726,104 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &950625337 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 950625338} + - component: {fileID: 950625340} + - component: {fileID: 950625339} + - component: {fileID: 950625341} + m_Layer: 5 + m_Name: touchIcon_1 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &950625338 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 950625337} + 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: 544814221} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.104, y: 0.24000001} + m_AnchorMax: {x: 0.80688155, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &950625339 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 950625337} + 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: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 2963885364918429243, guid: 39cad6bff01104e1d88fe7c761b20975, 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 &950625340 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 950625337} + m_CullTransparentMesh: 1 +--- !u!95 &950625341 +Animator: + serializedVersion: 7 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 950625337} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: a2297a59dc81f4b38b18c07e467c25a2, type: 2} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_StabilizeFeet: 0 + m_AnimatePhysics: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorStateOnDisable: 0 + m_WriteDefaultValuesOnDisable: 0 --- !u!1 &972544828 GameObject: m_ObjectHideFlags: 0 @@ -3997,7 +4908,11 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 +<<<<<<< Updated upstream m_fontSize: 15 +======= + m_fontSize: 28.05 +>>>>>>> Stashed changes m_fontSizeBase: 15 m_fontWeight: 400 m_enableAutoSizing: 0 @@ -4984,7 +5899,11 @@ RectTransform: m_GameObject: {fileID: 1132996214} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 15.86174} +<<<<<<< Updated upstream m_LocalScale: {x: 0.039654348, y: 0.039654348, z: 0.039654348} +======= + m_LocalScale: {x: 0.07, y: 0.08, z: 0.039654348} +>>>>>>> Stashed changes m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1762825452} @@ -5005,10 +5924,17 @@ RectTransform: - {fileID: 1799102430} m_Father: {fileID: 1236872181} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +<<<<<<< Updated upstream m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: -20, y: -1123} m_SizeDelta: {x: 12373.478, y: 19787.617} +======= + m_AnchorMin: {x: 0.0713077, y: 0.066} + m_AnchorMax: {x: 0.8885385, y: 0.92941123} + m_AnchoredPosition: {x: 11, y: -2572} + m_SizeDelta: {x: -424, y: -798} +>>>>>>> Stashed changes m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1132996216 MonoBehaviour: @@ -5053,6 +5979,139 @@ Transform: m_CorrespondingSourceObject: {fileID: 3808184343919685625, guid: 07b006aa2de034eda893fafc12f10bfe, type: 3} m_PrefabInstance: {fileID: 667033963} m_PrefabAsset: {fileID: 0} +<<<<<<< Updated upstream +======= + serializedVersion: 6 + m_Component: + - component: {fileID: 1158902907} + - component: {fileID: 1158902909} + - component: {fileID: 1158902908} + m_Layer: 5 + m_Name: date + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1158902907 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1158902906} + 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: 1018059749} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.73, y: 0.70600003} + m_AnchorMax: {x: 0.88600004, y: 0.799} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1158902908 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1158902906} + 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: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: 0 + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: d8d8551b2f264664992785b16876aa47, type: 2} + m_sharedMaterial: {fileID: 887919620621015924, guid: d8d8551b2f264664992785b16876aa47, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4278190080 + m_fontColor: {r: 0, g: 0, b: 0, 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: 42.2 + m_fontSizeBase: 36 + m_fontWeight: 400 + m_enableAutoSizing: 1 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 256 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_TextWrappingMode: 1 + 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 &1158902909 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1158902906} + m_CullTransparentMesh: 1 +>>>>>>> Stashed changes --- !u!1 &1168565393 GameObject: m_ObjectHideFlags: 0 @@ -5315,6 +6374,104 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1205220387} m_CullTransparentMesh: 1 +--- !u!1 &1221043353 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1221043354} + - component: {fileID: 1221043357} + - component: {fileID: 1221043356} + - component: {fileID: 1221043355} + m_Layer: 5 + m_Name: touchIcon_3 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1221043354 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1221043353} + 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: 1236872181} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.028768985, y: 0.30827522} + m_AnchorMax: {x: 0.1953834, y: 0.42700002} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!95 &1221043355 +Animator: + serializedVersion: 7 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1221043353} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: a2297a59dc81f4b38b18c07e467c25a2, type: 2} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_StabilizeFeet: 0 + m_AnimatePhysics: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorStateOnDisable: 0 + m_WriteDefaultValuesOnDisable: 0 +--- !u!114 &1221043356 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1221043353} + 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: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 2963885364918429243, guid: 39cad6bff01104e1d88fe7c761b20975, 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 &1221043357 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1221043353} + m_CullTransparentMesh: 1 --- !u!1 &1234680356 GameObject: m_ObjectHideFlags: 0 @@ -5488,6 +6645,9 @@ RectTransform: - {fileID: 928249291} - {fileID: 1205220388} - {fileID: 1132996215} + - {fileID: 148969557} + - {fileID: 1221043354} + - {fileID: 544814221} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} @@ -5678,6 +6838,7 @@ MonoBehaviour: day: 0 htext: {fileID: 510093824} paper: {fileID: 1275952601} + touchIcon2: {fileID: 148969556} --- !u!4 &1275952600 Transform: m_ObjectHideFlags: 0 @@ -9370,6 +10531,9 @@ MonoBehaviour: fadeInImg: {fileID: 928249289} peopleOut: 0 click: {fileID: 1963030527} + touchIcon1: {fileID: 950625337} + touchIcon2: {fileID: 148969556} + touchIcon3: {fileID: 1221043353} --- !u!82 &1963030527 AudioSource: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/Jisu/title_1.controller b/Assets/Scripts/Jisu/title_1.controller new file mode 100644 index 0000000..872dc42 --- /dev/null +++ b/Assets/Scripts/Jisu/title_1.controller @@ -0,0 +1,72 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1107 &-6675042010968291669 +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: 7697764810987774120} + m_Position: {x: 200, y: 0, 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: 7697764810987774120} +--- !u!91 &9100000 +AnimatorController: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: title_1 + serializedVersion: 5 + m_AnimatorParameters: [] + m_AnimatorLayers: + - serializedVersion: 5 + m_Name: Base Layer + m_StateMachine: {fileID: -6675042010968291669} + 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!1102 &7697764810987774120 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: titleAnimation + 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: e3feb232271ea3b4388f15e024a80d85, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: diff --git a/Assets/Scripts/Jisu/title_1.controller.meta b/Assets/Scripts/Jisu/title_1.controller.meta new file mode 100644 index 0000000..6eb198b --- /dev/null +++ b/Assets/Scripts/Jisu/title_1.controller.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 85c5f6cd2bd91422687ca87a1ea80bfb +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 9100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Jisu/touchIcon_1 2.controller b/Assets/Scripts/Jisu/touchIcon_1 2.controller new file mode 100644 index 0000000..4b514df --- /dev/null +++ b/Assets/Scripts/Jisu/touchIcon_1 2.controller @@ -0,0 +1,72 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1102 &-8817297931777928356 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: touchh + 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: 6f323862773134b51b5662e30e872368, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1107 &-7316235712615747055 +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: -8817297931777928356} + m_Position: {x: 200, y: 0, 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: -8817297931777928356} +--- !u!91 &9100000 +AnimatorController: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: touchIcon_1 2 + serializedVersion: 5 + m_AnimatorParameters: [] + m_AnimatorLayers: + - serializedVersion: 5 + m_Name: Base Layer + m_StateMachine: {fileID: -7316235712615747055} + 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} diff --git a/Assets/Scripts/Jisu/touchIcon_1 2.controller.meta b/Assets/Scripts/Jisu/touchIcon_1 2.controller.meta new file mode 100644 index 0000000..1e068e9 --- /dev/null +++ b/Assets/Scripts/Jisu/touchIcon_1 2.controller.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: a2297a59dc81f4b38b18c07e467c25a2 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 9100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Jisu/touchh.anim b/Assets/Scripts/Jisu/touchh.anim new file mode 100644 index 0000000..ef105a1 --- /dev/null +++ b/Assets/Scripts/Jisu/touchh.anim @@ -0,0 +1,191 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!74 &7400000 +AnimationClip: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: touchh + serializedVersion: 7 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: [] + m_ScaleCurves: [] + m_FloatCurves: + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_AnchoredPosition.x + path: + classID: 224 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 20 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 2 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_AnchoredPosition.y + path: + classID: 224 + script: {fileID: 0} + flags: 0 + m_PPtrCurves: [] + m_SampleRate: 60 + m_WrapMode: 0 + m_Bounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_ClipBindingConstant: + genericBindings: + - serializedVersion: 2 + path: 0 + attribute: 538195251 + script: {fileID: 0} + typeID: 224 + customType: 28 + isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + - serializedVersion: 2 + path: 0 + attribute: 1460864421 + script: {fileID: 0} + typeID: 224 + customType: 28 + isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + pptrCurveMapping: [] + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 2 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_HasAdditiveReferencePose: 0 + m_LoopTime: 1 + m_LoopBlend: 0 + m_LoopBlendOrientation: 0 + m_LoopBlendPositionY: 0 + m_LoopBlendPositionXZ: 0 + m_KeepOriginalOrientation: 0 + m_KeepOriginalPositionY: 1 + m_KeepOriginalPositionXZ: 0 + m_HeightFromFeet: 0 + m_Mirror: 0 + m_EditorCurves: + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_AnchoredPosition.x + path: + classID: 224 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 20 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 2 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_AnchoredPosition.y + path: + classID: 224 + script: {fileID: 0} + flags: 0 + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: [] diff --git a/Assets/Scripts/Jisu/touchh.anim.meta b/Assets/Scripts/Jisu/touchh.anim.meta new file mode 100644 index 0000000..8ec4ab3 --- /dev/null +++ b/Assets/Scripts/Jisu/touchh.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 6f323862773134b51b5662e30e872368 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Jiyun/Herbbook.cs b/Assets/Scripts/Jiyun/Herbbook.cs index 8c0ccd4..60b354a 100644 --- a/Assets/Scripts/Jiyun/Herbbook.cs +++ b/Assets/Scripts/Jiyun/Herbbook.cs @@ -11,6 +11,11 @@ public class Herbbook : MonoBehaviour public int day; public TextMeshProUGUI htext; // 페이지 public AudioSource paper; +<<<<<<< Updated upstream +======= + public GameObject touchIcon2; + +>>>>>>> Stashed changes void Start(){ paper = GetComponent(); @@ -20,10 +25,15 @@ void Start(){ } public void Open(){ // 노트 펼치기 + touchIcon2.SetActive(false); panel.DOLocalMoveY(0, 1f).SetEase(Ease.OutBack); } public void Close(){ // 노트 닫기 +<<<<<<< Updated upstream panel.DOLocalMoveY(-1100, 1f).SetEase(Ease.InBack); +======= + panel.DOLocalMoveY(-4000, 1f).SetEase(Ease.InBack); +>>>>>>> Stashed changes } void ShowPage(int page){ diff --git a/Assets/Scripts/Yura/sellerManage.cs b/Assets/Scripts/Yura/sellerManage.cs index 57e88c7..8cfb204 100644 --- a/Assets/Scripts/Yura/sellerManage.cs +++ b/Assets/Scripts/Yura/sellerManage.cs @@ -88,19 +88,28 @@ public class sellerManage : MonoBehaviour public AudioSource click; // 버튼 클릭 + public GameObject touchIcon1; + TextMeshProUGUI touchIconText; + // 시간 게이 + public GameObject touchIcon2; + public GameObject touchIcon3; + void Start() { click = GetComponent(); - + sellerText = GameObject.Find("Talk").GetComponent(); dateText = GameObject.Find("date").GetComponent(); - + touchIconText = GameObject.Find("touchIconText").GetComponent(); Debug.Log(currentdate); finalTrueHerbList.Clear(); //최종 허브 리스트 초기화 specialPersonList.Clear(); inum = 0; + touchIconText.enabled = true; + touchIcon2.SetActive(false); + touchIcon3.SetActive(false); herbImg.SetActive(true); day1.SetActive(false); day2.SetActive(false); @@ -182,6 +191,7 @@ void Start() void Update() { gamecursor.SetActive(false); + if (specialDone) { @@ -263,15 +273,15 @@ void showSpecialTalk(string person) //talkImage.SetActive(true); - if (person != special_Dialog[excelnum]["person"].ToString() || person == "none") + if (person != special_Dialog[excelnum]["person"].ToString() || person == "none") //person이 none 이거나,다음 줄 person 이 현재 person과 다르면 { inum++; - if (inum < specialPersonList.Count) + if (inum < specialPersonList.Count) // 아직 등장할 special 인물 남았으면? { - specialCustomer(); + specialCustomer(); //바뀐 person으로 인물 변경 -> excelnum 변경. return; } - else + else // special 인물 전부 끝났으면 { specialDone = true; specialSituation = false; @@ -281,6 +291,7 @@ void showSpecialTalk(string person) Debug.Log("showspecialTalk" + excelnum); string content = special_Dialog[excelnum]["content"].ToString(); + Debug.Log(content); talkImage.SetActive(true); sellerText.SetMsg(content); @@ -290,6 +301,11 @@ void showSpecialTalk(string person) { choiceDisplay(excelnum); } + if (excelnum == 8 || excelnum == 11) + { + if (excelnum == 8) touchIcon2.SetActive(true); + else touchIcon3.SetActive(true); + } excelnum++; isMouseClicked = false; } @@ -319,14 +335,42 @@ void choiceDisplay(int excelnum) } +<<<<<<< Updated upstream public void Btn1() +======= + public void talkNextBtn() + { + touchIcon1.SetActive(false); + touchIconText.enabled = false; + touchIcon2.SetActive(false); + touchIcon3.SetActive(false); + + if ((specialSituation && !isMouseClicked) || choiceClicked) + { + if (!isChoiceDisplayed) + { + click.Play(); + Debug.Log("업데이트문" + whatperson + excelnum); + isMouseClicked = true; + choiceClicked = false; + showSpecialTalk(whatperson); + + Debug.Log("다음 대사"); + + } + + } + } + + public void Btn1() // 선택지 버튼 1 +>>>>>>> Stashed changes { click.Play(); if (excelnum == 40) //여긴 원래대로 { excelnum = 40; // 여긴 1 뺀 수로 - whatperson = "goArmy1-1"; + whatperson = "goArmy1-1"; govermentLove -= 1; } else if (excelnum == 89) @@ -351,10 +395,15 @@ public void Btn1() BtnClear(); } - public void Btn2() + public void Btn2() // 선택지 버튼 2 { click.Play(); + if (excelnum == 3) + { + excelnum = 20; + whatperson = "herbGranpaA-1"; + } if (excelnum == 40) { excelnum = 43; @@ -393,7 +442,7 @@ public void Btn2() } - public void Btn3() + public void Btn3() //선택지 버튼 3 { click.Play(); diff --git a/Assets/img_ch/etc_ch/touch.png b/Assets/img_ch/etc_ch/touch.png new file mode 100644 index 0000000000000000000000000000000000000000..310ac45bcd2b14a437d225fa52f2d95f39c4a0f2 GIT binary patch literal 876 zcmV-y1C#uTP)Px&CP_p=RA@u(nO&A%U!I+l=d18IRV0&?0OYZizpVAOi?5fiNMRt3v@aiNG6kD zvHUZ`@AsdvJT1uk`@00v?RFuRO35Gy9k}xQ6-zr!hAl5 zdc6+CViAtVBY3^us|z(#LMs#sNg(}xUjiWzctwQ}j zBzrIz1iRf1gTVkYnal|Y=FDt1gGQqP<#PE9gxI6Zn=?fo0TKuVB#_~7C@X?$;F(Ay zU^<;bv)P1?j}JNQ4u^xLGP*(3hDWW<2esihpU;EMW|O=gjYdxtiO1tGnM|P7YC)w^ zk#d9_Znyhlh-rdo8At;u+g+z5p+gcr z7K_2p&kuZkeL<~OJ5l8I^_7nz-{0SIM}aA`i>YWd6J)>N%f9{9AiLd82GJ_#pI#BJAZCta+wE3XgkC*f zE#tN305ft0OBr&!y}hy5TF(T6RWcqd8xl-8VpeF8a$idcVw+(QS~(-tFKZctp~W4< ztl6IBb+;}>1PE&!U1%p1VR7Ii=ajoDa_=FT#dzA`hLc@@u*59@2t^njb=K@!($lj( z{X&P{Wt7W|zq^mPDx~YHyT0gA%Mp6*fcKS#D-9-X2o!$DEg?Kf!HB<^4uS@e^|spf zsB-U@w8!gewYpfct3}Vvqn6Q-