Merge branch 'master' of http://nas.ultracombos.com:3400/19050-Frozen2/Develop-19050-Frozen2

04-IceSlide/Unity-19050-04-IceSlide/19050-04-IceSlide/Assets/Frozen/RenderTexture/MainSpout.renderTexture

@@ -0,0 +1,36 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!84 &8400000
+RenderTexture:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: MainSpout
+  m_ImageContentsHash:
+    serializedVersion: 2
+    Hash: 00000000000000000000000000000000
+  m_ForcedFallbackFormat: 4
+  m_DownscaleFallback: 0
+  serializedVersion: 3
+  m_Width: 1920
+  m_Height: 886
+  m_AntiAliasing: 1
+  m_DepthFormat: 2
+  m_ColorFormat: 8
+  m_MipMap: 0
+  m_GenerateMips: 1
+  m_SRGB: 0
+  m_UseDynamicScale: 0
+  m_BindMS: 0
+  m_EnableCompatibleFormat: 1
+  m_TextureSettings:
+    serializedVersion: 2
+    m_FilterMode: 1
+    m_Aniso: 0
+    m_MipBias: 0
+    m_WrapU: 1
+    m_WrapV: 1
+    m_WrapW: 1
+  m_Dimension: 2
+  m_VolumeDepth: 1

04-IceSlide/Unity-19050-04-IceSlide/19050-04-IceSlide/Assets/Frozen/RenderTexture/MainSpout.renderTexture.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: c89b7927ec9d2e24bae4c4f58903aaa2
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 8400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

04-IceSlide/Unity-19050-04-IceSlide/19050-04-IceSlide/Assets/Script/FlakeIcon.cs

@@ -47,8 +47,28 @@ public class FlakeIcon : SnowFlake
             StartCoroutine(EndFade());
         }
 
+        if (State == IconState.SpwanFinished || State == IconState.Spwan)
+        {
+            PerlinPos();
+        }
+
+    }
+
+    [Range(1, 30)] public float perlinPosScale = 1;
+    [Range(0,2)] public float TimeScale = 1;
+    [Range(0, 1)] public float smooth = 0.1f;
+    private void PerlinPos()
+    {
+        
+        float perlinValueX = Mathf.PerlinNoise((Time.time + _snowFlakeBehaviour._rectTransform.anchoredPosition.x) * TimeScale, 0);
+        float perlinValueY = Mathf.PerlinNoise(0, (Time.time + _snowFlakeBehaviour._rectTransform.anchoredPosition.y) * TimeScale);
+        float valueX = Mathf.Lerp(-perlinPosScale, perlinPosScale, perlinValueX);
+        float valueY = Mathf.Lerp(-perlinPosScale, perlinPosScale, perlinValueY);
+        float Xvalue = rectTransform.anchoredPosition.x + rectTransform.anchoredPosition.y;
+        rectTransform.anchoredPosition += (new Vector2(valueX, valueY) - rectTransform.anchoredPosition) * smooth;
     }
 
+
     IEnumerator EndFade()
     {
         float time = 1;
@@ -67,6 +87,7 @@ public class FlakeIcon : SnowFlake
     public override void PlayAnimation()
     {
         State = IconState.Spwan;
+        rectTransform.anchoredPosition = Vector2.zero;
         StartCoroutine(GoSpawn());
     }
 

04-IceSlide/Unity-19050-04-IceSlide/19050-04-IceSlide/Assets/Script/FlakePosition.cs

@@ -0,0 +1,88 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+using UnityEngine.UI;
+
+public class FlakePosition : MonoBehaviour
+{
+
+    public static FlakePosition Instance;
+
+    [AutoUI] public bool View;
+    [AutoUI] public Vector2 Position1;
+    [AutoUI] public Vector2 Position2;
+    [AutoUI] public Vector2 Position3;
+    [AutoUI] public Vector2 Position4;
+    [AutoUI] public Vector2 Position5;
+    [AutoUI] public Vector2 Position6;
+
+    private RawImage[] imgs;
+    [SerializeField] private List<int> PositionSeed = new List<int>();
+
+    // Start is called before the first frame update
+    void Awake()
+    {
+        Instance = this;
+        imgs = GetComponentsInChildren<RawImage>();
+        for (int seed = 1;seed <= 6; seed++)
+            PositionSeed.Add(seed);
+    }
+
+    // Update is called once per frame
+    void Update()
+    {
+        if((Time.frameCount & 0x19) == 0)
+        {
+            SetImgEnable(View);
+        }
+    }
+
+    public void SetImgEnable(bool view)
+    {
+
+        for(int i = 0;i<imgs.Length;i++)
+        {
+            imgs[i].enabled = view;
+            imgs[i].rectTransform.anchoredPosition = GetPos(i + 1);
+        }
+
+    }
+
+    public int Take(out Vector2 pos)
+    {
+        var random = Random.Range(0, PositionSeed.Count);
+        var seed = PositionSeed[random];
+        Debug.Log(seed);
+        pos = GetPos(seed);
+        PositionSeed.RemoveAt(random);
+        return seed;
+    }
+
+    public void Put(int seed)
+    {
+        PositionSeed.Add(seed);
+    }
+
+
+    public Vector2 GetPos(int seed)
+    {
+        switch(seed)
+        {
+            case 1:
+                return Position1;
+            case 2:
+                return Position2;
+            case 3:
+                return Position3;
+            case 4:
+                return Position4;
+            case 5:
+                return Position5;
+            case 6:
+                return Position6;
+        }
+        return Vector2.zero;
+    }
+
+
+}

04-IceSlide/Unity-19050-04-IceSlide/19050-04-IceSlide/Assets/Script/FlakePosition.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: ad67b7a67ebbed24faf86849bf03e02f
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

04-IceSlide/Unity-19050-04-IceSlide/19050-04-IceSlide/Assets/Script/SnowFlakeBehaviour.cs

@@ -5,13 +5,16 @@ using UnityEngine.UI;
 
 public class SnowFlakeBehaviour : MonoBehaviour
 {
+
+    public bool Logo;
+
     [AutoUI] public float Scale = 1;
 
     [AutoUI] public int IconSize = 256;
 
     [AutoUI] public int FlakeSize = 512;
 
-    [AutoUI] public Vector2 Position;
+    //[AutoUI] public Vector2 Position;
 
     [AutoUI] public float DisappearTime = 5;
 
@@ -30,7 +33,9 @@ public class SnowFlakeBehaviour : MonoBehaviour
     public SnowFlake[] SnowFlakes;
 
     [SerializeField] private SnowFlake _currentFlake;
-    private RectTransform _rectTransform;
+    public RectTransform _rectTransform;
+
+    private int positionSeed;
 
     // Start is called before the first frame update
     void Start()
@@ -39,9 +44,11 @@ public class SnowFlakeBehaviour : MonoBehaviour
         {
             flake._snowFlakeBehaviour = this;
         }
-        Play();
+       
         _colliderImage = _colliderRectTransform.GetComponent<RawImage>();
         _rectTransform = GetComponent<RectTransform>();
+        positionSeed = 0;
+        Play();
     }
 
     // Update is called once per frame
@@ -50,7 +57,7 @@ public class SnowFlakeBehaviour : MonoBehaviour
         if((Time.frameCount & 0x19) == 0)
         {
             _colliderImage.color = ViewCollider ? Color.white : new Color(1,1,1,0);
-            _rectTransform.anchoredPosition = Position;
+            //_rectTransform.anchoredPosition = Position;
             _rectTransform.localScale = Vector3.one * Scale;
         }
           
@@ -69,8 +76,6 @@ public class SnowFlakeBehaviour : MonoBehaviour
 
         waitTime = Mathf.Max(0, waitTime);
 
-        Debug.Log(waitTime);
-
         yield return new WaitForSeconds(waitTime);
 
         Play();
@@ -78,6 +83,14 @@ public class SnowFlakeBehaviour : MonoBehaviour
 
     public void Play()
     {
+        if(Logo == false)
+        {
+            if (positionSeed != 0)
+                FlakePosition.Instance.Put(positionSeed);
+            positionSeed = FlakePosition.Instance.Take(out var newPos);
+            _rectTransform.anchoredPosition = newPos;
+        }
+
         _currentFlake = SnowFlakes[Random.Range(0, SnowFlakes.Length)];
         Debug.Log(_currentFlake.gameObject.name);
         _currentFlake.PlayAnimation();

04-IceSlide/Unity-19050-04-IceSlide/19050-04-IceSlide/Assets/Script/TouchArea.cs

@@ -73,7 +73,6 @@ public class TouchArea : MonoBehaviour, IPointerDownHandler, IDragHandler, IPoin
                 {
                     if(result.gameObject == gameObject)
                     {
-                        print($"trigger : {gameObject.name}");
                         RayHit.Invoke(pointerdata);
                     }
                 }
@@ -110,7 +109,6 @@ public class TouchArea : MonoBehaviour, IPointerDownHandler, IDragHandler, IPoin
 
     public void OnPointerExit(PointerEventData eventData)
     {
-        Debug.Log("Exit:" + gameObject.name);
         if (PointerExit == null)
             return;
         if (skip_on_mouse_only(eventData))
@@ -120,7 +118,6 @@ public class TouchArea : MonoBehaviour, IPointerDownHandler, IDragHandler, IPoin
 
     public void OnPointerEnter(PointerEventData eventData)
     {
-        Debug.Log("Enter:" + gameObject.name);
         if (PointerEnter == null)
             return;
         if (skip_on_mouse_only(eventData))

04-IceSlide/Unity-19050-04-IceSlide/19050-04-IceSlide/Packages/manifest.json

@@ -13,7 +13,7 @@
     "com.unity.purchasing": "2.0.6",
     "com.unity.textmeshpro": "2.0.0",
     "com.unity.timeline": "1.0.0",
-    "jp.keijiro.klak.spout": "file:<project>/../../../../../_Package/KlakSpout",
+    "jp.keijiro.klak.spout": "file:C:/Users/user/Desktop/Project-19050-Frozen2/_Develop/_Package/KlakSpout",
     "com.unity.modules.ai": "1.0.0",
     "com.unity.modules.animation": "1.0.0",
     "com.unity.modules.assetbundle": "1.0.0",

04-IceSlide/Unity-19050-04-IceSlide/19050-04-IceSlide/settings-default.json

@@ -1,86 +1,101 @@
 {
   "SceneCamera/Canvas/Flake1/Scale": 1.0,
-  "SceneCamera/Canvas/Flake1/Position": [
+  "SceneCamera/Canvas/Flake1/IconSize": 256,
-    -500.0,
+  "SceneCamera/Canvas/Flake1/FlakeSize": 512,
-    200.0
-  ],
   "SceneCamera/Canvas/Flake1/DisappearTime": 5.0,
   "SceneCamera/Canvas/Flake1/DisappearTimeRandomRange": 2.0,
   "SceneCamera/Canvas/Flake1/ViewCollider": false,
   "SceneCamera/Canvas/Flake1/ColliderPosition": [
-    460.0,
+    0.0,
     0.0
   ],
   "SceneCamera/Canvas/Flake1/ColliderSize": [
-    400.0,
+    256.0,
-    400.0
+    256.0
   ],
   "SceneCamera/Canvas/Flake2/Scale": 1.0,
-  "SceneCamera/Canvas/Flake2/Position": [
+  "SceneCamera/Canvas/Flake2/IconSize": 256,
-    500.0,
+  "SceneCamera/Canvas/Flake2/FlakeSize": 512,
-    200.0
-  ],
   "SceneCamera/Canvas/Flake2/DisappearTime": 5.0,
   "SceneCamera/Canvas/Flake2/DisappearTimeRandomRange": 2.0,
   "SceneCamera/Canvas/Flake2/ViewCollider": false,
   "SceneCamera/Canvas/Flake2/ColliderPosition": [
-    460.0,
+    0.0,
     0.0
   ],
   "SceneCamera/Canvas/Flake2/ColliderSize": [
-    400.0,
+    256.0,
-    400.0
+    256.0
   ],
   "SceneCamera/Canvas/Flake3/Scale": 1.0,
-  "SceneCamera/Canvas/Flake3/Position": [
+  "SceneCamera/Canvas/Flake3/IconSize": 256,
-    500.0,
+  "SceneCamera/Canvas/Flake3/FlakeSize": 512,
-    -200.0
-  ],
   "SceneCamera/Canvas/Flake3/DisappearTime": 5.0,
   "SceneCamera/Canvas/Flake3/DisappearTimeRandomRange": 2.0,
   "SceneCamera/Canvas/Flake3/ViewCollider": false,
   "SceneCamera/Canvas/Flake3/ColliderPosition": [
-    460.0,
+    0.0,
     0.0
   ],
   "SceneCamera/Canvas/Flake3/ColliderSize": [
-    400.0,
+    256.0,
-    400.0
+    256.0
   ],
   "SceneCamera/Canvas/Flake4/Scale": 1.0,
-  "SceneCamera/Canvas/Flake4/Position": [
+  "SceneCamera/Canvas/Flake4/IconSize": 256,
-    -500.0,
+  "SceneCamera/Canvas/Flake4/FlakeSize": 512,
-    -200.0
-  ],
   "SceneCamera/Canvas/Flake4/DisappearTime": 5.0,
   "SceneCamera/Canvas/Flake4/DisappearTimeRandomRange": 2.0,
   "SceneCamera/Canvas/Flake4/ViewCollider": false,
   "SceneCamera/Canvas/Flake4/ColliderPosition": [
-    460.0,
+    0.0,
     0.0
   ],
   "SceneCamera/Canvas/Flake4/ColliderSize": [
-    400.0,
+    256.0,
-    400.0
+    256.0
   ],
   "SceneCamera/Canvas/FlakeLogo/Scale": 1.0,
-  "SceneCamera/Canvas/FlakeLogo/Position": [
+  "SceneCamera/Canvas/FlakeLogo/IconSize": 256,
-    0.0,
+  "SceneCamera/Canvas/FlakeLogo/FlakeSize": 512,
-    0.0
-  ],
   "SceneCamera/Canvas/FlakeLogo/DisappearTime": 5.0,
   "SceneCamera/Canvas/FlakeLogo/DisappearTimeRandomRange": 2.0,
   "SceneCamera/Canvas/FlakeLogo/ViewCollider": false,
   "SceneCamera/Canvas/FlakeLogo/ColliderPosition": [
-    460.0,
+    0.0,
     0.0
   ],
   "SceneCamera/Canvas/FlakeLogo/ColliderSize": [
-    400.0,
+    256.0,
-    400.0
+    256.0
   ],
   "SpoutCamera/Canvas/Pointer/Visible": true,
   "SpoutCamera/Canvas/Pointer/PointSize": 256,
+  "SpoutCamera/Canvas/FlakePosition/View": false,
+  "SpoutCamera/Canvas/FlakePosition/Position1": [
+    -500.0,
+    0.0
+  ],
+  "SpoutCamera/Canvas/FlakePosition/Position2": [
+    -250.0,
+    -300.0
+  ],
+  "SpoutCamera/Canvas/FlakePosition/Position3": [
+    250.0,
+    -300.0
+  ],
+  "SpoutCamera/Canvas/FlakePosition/Position4": [
+    500.0,
+    0.0
+  ],
+  "SpoutCamera/Canvas/FlakePosition/Position5": [
+    250.0,
+    300.0
+  ],
+  "SpoutCamera/Canvas/FlakePosition/Position6": [
+    -250.0,
+    300.0
+  ],
   "ParticleCamera/ParticlePool/GroupCount": 5,
   "ParticleCamera/ParticlePool/ParticleAmount": 1
 }