Synchronized with all bug fixes in submodules

FredericRP · Oct 13, 2021 · 059fb24 · 059fb24
1 parent 5731e9a
commit 059fb24
Show file tree

Hide file tree

Showing 16 changed files with 42 additions and 96 deletions.
diff --git a/Assets/FourScenesTemplate/Materials/UIScrolling.mat b/Assets/FourScenesTemplate/Materials/UIScrolling.mat
@@ -42,7 +42,7 @@ Material:
     - _MainTex:
         m_Texture: {fileID: 0}
         m_Scale: {x: 14, y: 14}
-        m_Offset: {x: 0.86869913, y: -1332.707}
+        m_Offset: {x: 0.86869913, y: -1347.7592}
     - _MetallicGlossMap:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}

diff --git a/Assets/FourScenesTemplate/Scenes/2.asyncLoading.unity b/Assets/FourScenesTemplate/Scenes/2.asyncLoading.unity
@@ -569,71 +569,11 @@ PrefabInstance:
       propertyPath: m_LocalEulerAnglesHint.z
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 2451706824236077445, guid: b27ce9dfbcf8c414d99875c615fb8a78,
-        type: 3}
-      propertyPath: m_Enabled
-      value: 0
-      objectReference: {fileID: 0}
     - target: {fileID: 2451706824236099648, guid: b27ce9dfbcf8c414d99875c615fb8a78,
         type: 3}
       propertyPath: m_Name
       value: transitionCutOut
       objectReference: {fileID: 0}
-    - target: {fileID: 3110091434978851479, guid: b27ce9dfbcf8c414d99875c615fb8a78,
-        type: 3}
-      propertyPath: m_textInfo.lineCount
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 3110091434978851479, guid: b27ce9dfbcf8c414d99875c615fb8a78,
-        type: 3}
-      propertyPath: m_textInfo.pageCount
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 3110091434978851479, guid: b27ce9dfbcf8c414d99875c615fb8a78,
-        type: 3}
-      propertyPath: m_textInfo.wordCount
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 3110091434978851479, guid: b27ce9dfbcf8c414d99875c615fb8a78,
-        type: 3}
-      propertyPath: m_textInfo.spaceCount
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 3110091434978851479, guid: b27ce9dfbcf8c414d99875c615fb8a78,
-        type: 3}
-      propertyPath: m_textInfo.characterCount
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 3538851594745827440, guid: b27ce9dfbcf8c414d99875c615fb8a78,
-        type: 3}
-      propertyPath: m_AnchoredPosition.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 4757644166935809849, guid: b27ce9dfbcf8c414d99875c615fb8a78,
-        type: 3}
-      propertyPath: m_AnchoredPosition.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 6139287869112479378, guid: b27ce9dfbcf8c414d99875c615fb8a78,
-        type: 3}
-      propertyPath: max
-      value: 100
-      objectReference: {fileID: 0}
-    - target: {fileID: 6153159035728895929, guid: b27ce9dfbcf8c414d99875c615fb8a78,
-        type: 3}
-      propertyPath: m_Color.b
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 6153159035728895929, guid: b27ce9dfbcf8c414d99875c615fb8a78,
-        type: 3}
-      propertyPath: m_Color.g
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 6153159035728895929, guid: b27ce9dfbcf8c414d99875c615fb8a78,
-        type: 3}
-      propertyPath: m_Color.r
-      value: 1
-      objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: b27ce9dfbcf8c414d99875c615fb8a78, type: 3}
 --- !u!1 &785682119
@@ -725,7 +665,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: 8ae815918cc2d3549913c6dc9920f878, type: 3}
+  m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0}
   m_Type: 1
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -802,7 +742,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: 5f867b214206e3247a8f0d476a3d70ed, type: 3}
+  m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0}
   m_Type: 1
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -829,14 +769,16 @@ MonoBehaviour:
   m_GameObject: {fileID: 1487919687}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 966bdac3a49f68543a05b7cbd095317f, type: 3}
+  m_Script: {fileID: 11500000, guid: 35d474f41b52e414d815f0ed79990d65, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  gaugeRect: {fileID: 1358848932}
-  progressEvent: {fileID: 11400000, guid: deda303c00624cf4a9eb5704316ab78b, type: 2}
-  anchorMin: 0.1
+  progressEvent: {fileID: 11400000, guid: 7527186898a727f4bbaa115930edcd25, type: 2}
   ratio: 0.5
   offset: 0
+  gaugeId: 
+  gaugeRect: {fileID: 1358848932}
+  anchorMin: 0.1
+  hideBelowMin: 0
 --- !u!1 &1489735758
 GameObject:
   m_ObjectHideFlags: 0
@@ -1056,13 +998,14 @@ MonoBehaviour:
   m_GameObject: {fileID: 1678050491}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 88472ba557146af42b64b7ef5af8f4f3, type: 3}
+  m_Script: {fileID: 11500000, guid: 9671f0983501c8c4ea13916695d0b87a, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  progressEvent: {fileID: 11400000, guid: deda303c00624cf4a9eb5704316ab78b, type: 2}
-  text: {fileID: 1678050493}
+  progressEvent: {fileID: 11400000, guid: 7527186898a727f4bbaa115930edcd25, type: 2}
   ratio: 0.5
   offset: 0
+  gaugeId: 
+  text: {fileID: 1678050493}
 --- !u!1 &1797465921
 GameObject:
   m_ObjectHideFlags: 0
@@ -1225,7 +1168,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   sceneLoader: {fileID: 5554417621206667265}
-  loadingProgressEvent: {fileID: 11400000, guid: deda303c00624cf4a9eb5704316ab78b,
+  loadingProgressEvent: {fileID: 11400000, guid: 7527186898a727f4bbaa115930edcd25,
     type: 2}
   delayToUpdateProgress: 0.05
 --- !u!114 &5554417621206667265

diff --git a/Assets/FourScenesTemplate/Scenes/3.gameDataLoading.unity b/Assets/FourScenesTemplate/Scenes/3.gameDataLoading.unity
@@ -182,7 +182,7 @@ Canvas:
   m_OverrideSorting: 0
   m_OverridePixelPerfect: 0
   m_SortingBucketNormalizedSize: 0
-  m_AdditionalShaderChannelsFlag: 25
+  m_AdditionalShaderChannelsFlag: 1
   m_SortingLayerID: 0
   m_SortingOrder: 0
   m_TargetDisplay: 0
@@ -417,7 +417,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: 5f867b214206e3247a8f0d476a3d70ed, type: 3}
+  m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0}
   m_Type: 1
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -436,14 +436,16 @@ MonoBehaviour:
   m_GameObject: {fileID: 766592085}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 966bdac3a49f68543a05b7cbd095317f, type: 3}
+  m_Script: {fileID: 11500000, guid: 35d474f41b52e414d815f0ed79990d65, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  gaugeRect: {fileID: 1553920540}
-  progressEvent: {fileID: 11400000, guid: deda303c00624cf4a9eb5704316ab78b, type: 2}
-  anchorMin: 0.1
+  progressEvent: {fileID: 11400000, guid: 7527186898a727f4bbaa115930edcd25, type: 2}
   ratio: 0.5
   offset: 0.5
+  gaugeId: 
+  gaugeRect: {fileID: 1553920540}
+  anchorMin: 0.1
+  hideBelowMin: 0
 --- !u!222 &766592089
 CanvasRenderer:
   m_ObjectHideFlags: 0
@@ -588,13 +590,14 @@ MonoBehaviour:
   m_GameObject: {fileID: 969660449}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 88472ba557146af42b64b7ef5af8f4f3, type: 3}
+  m_Script: {fileID: 11500000, guid: 9671f0983501c8c4ea13916695d0b87a, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  progressEvent: {fileID: 11400000, guid: deda303c00624cf4a9eb5704316ab78b, type: 2}
-  text: {fileID: 969660451}
+  progressEvent: {fileID: 11400000, guid: 7527186898a727f4bbaa115930edcd25, type: 2}
   ratio: 0.5
   offset: 0.5
+  gaugeId: 
+  text: {fileID: 969660451}
 --- !u!222 &969660453
 CanvasRenderer:
   m_ObjectHideFlags: 0
@@ -907,7 +910,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: 8ae815918cc2d3549913c6dc9920f878, type: 3}
+  m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0}
   m_Type: 1
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -1015,6 +1018,6 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   sceneLoader: {fileID: 2129670409}
-  loadingProgressEvent: {fileID: 11400000, guid: deda303c00624cf4a9eb5704316ab78b,
+  loadingProgressEvent: {fileID: 11400000, guid: 7527186898a727f4bbaa115930edcd25,
     type: 2}
   delayToUpdateProgress: 0.05
diff --git a/Assets/Standard Assets/EasyLoading b/Assets/Standard Assets/EasyLoading
diff --git a/Assets/Standard Assets/EventManagement b/Assets/Standard Assets/EventManagement
diff --git a/Assets/Standard Assets/GameQuest b/Assets/Standard Assets/GameQuest
diff --git a/Assets/Standard Assets/GenericSingleton b/Assets/Standard Assets/GenericSingleton
diff --git a/Assets/Standard Assets/PersistentDataSystem b/Assets/Standard Assets/PersistentDataSystem
diff --git a/Assets/Standard Assets/PlayerCurrency b/Assets/Standard Assets/PlayerCurrency
diff --git a/Assets/Standard Assets/PopupHandler b/Assets/Standard Assets/PopupHandler
diff --git a/Assets/Standard Assets/ScreenTransitions b/Assets/Standard Assets/ScreenTransitions
diff --git a/Assets/Standard Assets/SimpleLocalization b/Assets/Standard Assets/SimpleLocalization
diff --git a/Assets/Standard Assets/StringDataList b/Assets/Standard Assets/StringDataList
diff --git a/Assets/Standard Assets/Tips b/Assets/Standard Assets/Tips
diff --git a/ProjectSettings/EditorBuildSettings.asset b/ProjectSettings/EditorBuildSettings.asset
@@ -18,7 +18,7 @@ EditorBuildSettings:
     path: Assets/FourScenesTemplate/Scenes/4.menu.unity
     guid: 1d64b1a0222954c4cbbd9cb21c64e912
   - enabled: 1
-    path: Assets/FourScenesTemplate/Example/Scenes/game.unity
+    path: Assets/FourScenesTemplate/Sample/Scenes/game.unity
     guid: 7490cbb7fd83e4e4caf06af3fc3fe4b7
   m_configObjects:
     com.unity.addressableassets: {fileID: 11400000, guid: 77b9297f4cb867042910978dcabdf96a,

diff --git a/ProjectSettings/ProjectVersion.txt b/ProjectSettings/ProjectVersion.txt
@@ -1,2 +1,2 @@
-m_EditorVersion: 2020.3.18f1
-m_EditorVersionWithRevision: 2020.3.18f1 (a7d1c678663c)
+m_EditorVersion: 2020.3.20f1
+m_EditorVersionWithRevision: 2020.3.20f1 (41c4e627c95f)
+21 −0		CHANGELOG.md
+7 −0		CHANGELOG.md.meta
+ −		Documentation~/Images/loadScene.jpg
+ −		Documentation~/Images/transition-sample.gif
+21 −0		LICENSE.md
+7 −0		LICENSE.md.meta
+34 −0		README.md
+7 −0		README.md.meta
+9 −1		Runtime/Events/GaugeProgressEvent.asset
+8 −8		Runtime/Scripts/LoadingProgress/MonitorGaugeProgress.cs
+2 −2		Runtime/Scripts/LoadingProgress/UpdateLoadingProgress.cs
+3 −0		CHANGELOG.md
+8 −0		Editor/Scripts/CodeGeneration.meta
+211 −0		Editor/Scripts/CodeGeneration/NewTypeWindow.cs
+11 −0		Editor/Scripts/CodeGeneration/NewTypeWindow.cs.meta
+27 −0		Editor/Scripts/Generic/ThreeTypeGameEventInspector.cs
+11 −0		Editor/Scripts/Generic/ThreeTypeGameEventInspector.cs.meta
+8 −0		Editor/Scripts/Typed/FloatIntGameEventInspector.cs
+11 −0		Editor/Scripts/Typed/FloatIntGameEventInspector.cs.meta
+8 −0		Editor/Scripts/Typed/FloatStringGameEventInspector.cs
+11 −0		Editor/Scripts/Typed/FloatStringGameEventInspector.cs.meta
+8 −0		Editor/Scripts/Typed/StringFloatGameEventInspector.cs
+11 −0		Editor/Scripts/Typed/StringFloatGameEventInspector.cs.meta
+3 −4		Editor/Scripts/Typed/StringIntGameEventInspector.cs
+7 −1		README.md
+36 −0		Runtime/Scripts/TypedGameEvent/Generic/ThreeTypeGameEvent.cs
+11 −0		Runtime/Scripts/TypedGameEvent/Generic/ThreeTypeGameEvent.cs.meta
+8 −0		Runtime/Scripts/TypedGameEvent/Typed/FloatIntGameEvent.cs
+11 −0		Runtime/Scripts/TypedGameEvent/Typed/FloatIntGameEvent.cs.meta
+8 −0		Runtime/Scripts/TypedGameEvent/Typed/FloatStringGameEvent.cs
+11 −0		Runtime/Scripts/TypedGameEvent/Typed/FloatStringGameEvent.cs.meta
+8 −0		Runtime/Scripts/TypedGameEvent/Typed/StringFloatGameEvent.cs
+11 −0		Runtime/Scripts/TypedGameEvent/Typed/StringFloatGameEvent.cs.meta
+3 −4		Runtime/Scripts/TypedGameEvent/Typed/StringIntGameEvent.cs
+2 −0		CHANGELOG.md
+ −		Documentation~/images/catalog.jpg
+ −		Documentation~/images/currency-event.gif
+ −		Documentation~/images/first-quest.gif
+2 −1		Editor/FredericRP.GameQuest.Editor.asmdef
+9 −0		Editor/Scripts/GameQuestEventInspector.cs
+11 −0		Editor/Scripts/GameQuestEventInspector.cs.meta
+15 −14		Editor/Scripts/GameQuestInfoDrawer.cs
+9 −0		Editor/Scripts/GameQuestRewardEventInspector.cs
+11 −0		Editor/Scripts/GameQuestRewardEventInspector.cs.meta
+54 −3		README.md
+28 −0		Runtime/Sample/Data/GameQuestCatalog.asset
+16 −0		Runtime/Sample/Data/Reward-150Seeds.asset
+8 −0		Runtime/Sample/Data/Reward-150Seeds.asset.meta
+4 −0		Runtime/Sample/GameEvents/GameQuestRewardEvent.asset
+28 −0		Runtime/Sample/GameEvents/QuestComplete.asset
+28 −0		Runtime/Sample/GameEvents/QuestExpired.asset
+28 −0		Runtime/Sample/GameEvents/QuestLaunched.asset
+28 −0		Runtime/Sample/GameEvents/QuestValidated.asset
+28 −0		Runtime/Sample/GameEvents/QuestWaitingForEnable.asset
+145 −5		Runtime/Sample/Prefabs/GameQuest.prefab
+16 −1		Runtime/Sample/Prefabs/GameQuestListPopup.prefab
+18 −0		Runtime/Sample/Prefabs/GameQuestManager.prefab
+2 −4		Runtime/Sample/Resources/Localized/en/messages.txt
+26 −1		Runtime/Sample/Scenes/GameQuestExample.unity
+22 −39		Runtime/Sample/Scripts/Flower/FlowerGrabQuestReceiver.cs
+70 −4		Runtime/Sample/Scripts/Popup/GameQuestItem.cs
+16 −2		Runtime/Sample/Scripts/Popup/GameQuestListPopup.cs
+1 −3		Runtime/Scripts/GameQuestEvent.cs
+10 −17		Runtime/Scripts/GameQuestInfo.cs
+9 −12		Runtime/Scripts/GameQuestManager.cs
+2 −5		Runtime/Scripts/GameQuestRewardEvent.cs
+42 −15		Runtime/Scripts/GameQuestSavedData.cs
+1 −1		Runtime/Scripts/PlayerCurrencyReward.cs