Merge branch 'develop' of http://175.209.66.186/capersunity/newbluewater into ntg

Assets/02.Scripts/ScriptableObject/GameTimeData.asset

@@ -12,6 +12,6 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 02ad0ead42640754d821166bbeec1306, type: 3}
   m_Name: GameTimeData
   m_EditorClassIdentifier: 
-  <TimeIncrementPerMinutes>k__BackingField: 1
+  <TimeIncrementPerMinutes>k__BackingField: 1.5
   <TycoonOpenTime>k__BackingField: 18
   <TycoonCloseTime>k__BackingField: 22

Assets/BlueWater (Auto-Backup).asset

@@ -118,6 +118,20 @@ MonoBehaviour:
       value: 
       type: 0
       typeString: 
+  - id: 3
+    fields:
+    - title: Name
+      value: RandomChoice
+      type: 0
+      typeString: 
+    - title: Initial Value
+      value: 0
+      type: 1
+      typeString: CustomFieldType_Number
+    - title: Description
+      value: 
+      type: 0
+      typeString: 
   conversations:
   - id: 1
     fields:
@@ -222,7 +236,10 @@ MonoBehaviour:
         isConnector: 0
         priority: 2
       conditionsString: 
-      userScript: 
+      userScript: 'local randomValue = math.random(1, 3)
+
+        Variable["RandomChoice"]
+        = randomValue'
       onExecute:
         m_PersistentCalls:
           m_Calls: []
@@ -270,7 +287,7 @@ MonoBehaviour:
       falseConditionAction: Block
       conditionPriority: 2
       outgoingLinks: []
-      conditionsString: 
+      conditionsString: Variable["RandomChoice"] == 1
       userScript: 
       onExecute:
         m_PersistentCalls:
@@ -319,7 +336,7 @@ MonoBehaviour:
       falseConditionAction: Block
       conditionPriority: 2
       outgoingLinks: []
-      conditionsString: 
+      conditionsString: Variable["RandomChoice"] == 2
       userScript: 
       onExecute:
         m_PersistentCalls:
@@ -368,7 +385,7 @@ MonoBehaviour:
       falseConditionAction: Block
       conditionPriority: 2
       outgoingLinks: []
-      conditionsString: 
+      conditionsString: Variable["RandomChoice"] == 3
       userScript: 
       onExecute:
         m_PersistentCalls:
@@ -485,7 +502,10 @@ MonoBehaviour:
         isConnector: 0
         priority: 2
       conditionsString: 
-      userScript: 
+      userScript: 'local randomValue = math.random(1, 3)
+
+        Variable["RandomChoice"]
+        = randomValue'
       onExecute:
         m_PersistentCalls:
           m_Calls: []
@@ -533,7 +553,7 @@ MonoBehaviour:
       falseConditionAction: Block
       conditionPriority: 2
       outgoingLinks: []
-      conditionsString: 
+      conditionsString: Variable["RandomChoice"] == 1
       userScript: 
       onExecute:
         m_PersistentCalls:
@@ -582,7 +602,7 @@ MonoBehaviour:
       falseConditionAction: Block
       conditionPriority: 2
       outgoingLinks: []
-      conditionsString: 
+      conditionsString: Variable["RandomChoice"] == 2
       userScript: 
       onExecute:
         m_PersistentCalls:
@@ -631,7 +651,7 @@ MonoBehaviour:
       falseConditionAction: Block
       conditionPriority: 2
       outgoingLinks: []
-      conditionsString: 
+      conditionsString: Variable["RandomChoice"] == 3
       userScript: 
       onExecute:
         m_PersistentCalls:
@@ -748,13 +768,15 @@ MonoBehaviour:
         isConnector: 0
         priority: 2
       conditionsString: 
-      userScript: 
+      userScript: "local happyPoint = Variable[\"HappyPoint\"]\nif happyPoint >=
+        3 then\n    print(\"Condition met: HappyPoint >= 3\")\nelse\n    print(\"Condition
+        not met: HappyPoint < 3\")\nend"
       onExecute:
         m_PersistentCalls:
           m_Calls: []
       canvasRect:
         serializedVersion: 2
-        x: 1120
+        x: 1118.6843
         y: 50
         width: 160
         height: 30
@@ -796,7 +818,7 @@ MonoBehaviour:
       falseConditionAction: Block
       conditionPriority: 2
       outgoingLinks: []
-      conditionsString: 
+      conditionsString: Variable["RandomChoice"] == 1
       userScript: 
       onExecute:
         m_PersistentCalls:
@@ -864,7 +886,10 @@ MonoBehaviour:
         isConnector: 0
         priority: 2
       conditionsString: Variable["HappyPoint"] >= 3
-      userScript: 
+      userScript: 'local randomValue = math.random(1, 3)
+
+        Variable["RandomChoice"]
+        = randomValue'
       onExecute:
         m_PersistentCalls:
           m_Calls: []
@@ -932,7 +957,10 @@ MonoBehaviour:
         priority: 2
       conditionsString: (Variable["HappyPoint"] == 1) or (Variable["HappyPoint"]
         == 2)
-      userScript: 
+      userScript: 'local randomValue = math.random(1, 3)
+
+        Variable["RandomChoice"]
+        = randomValue'
       onExecute:
         m_PersistentCalls:
           m_Calls: []
@@ -1011,7 +1039,10 @@ MonoBehaviour:
         isConnector: 0
         priority: 2
       conditionsString: Variable["HappyPoint"] <= 0
-      userScript: 
+      userScript: 'local randomValue = math.random(1, 5)
+
+        Variable["RandomChoice"]
+        = randomValue'
       onExecute:
         m_PersistentCalls:
           m_Calls: []
@@ -1059,7 +1090,7 @@ MonoBehaviour:
       falseConditionAction: Block
       conditionPriority: 2
       outgoingLinks: []
-      conditionsString: 
+      conditionsString: Variable["RandomChoice"] == 2
       userScript: 
       onExecute:
         m_PersistentCalls:
@@ -1108,7 +1139,7 @@ MonoBehaviour:
       falseConditionAction: Block
       conditionPriority: 2
       outgoingLinks: []
-      conditionsString: 
+      conditionsString: Variable["RandomChoice"] == 1
       userScript: 
       onExecute:
         m_PersistentCalls:
@@ -1157,7 +1188,7 @@ MonoBehaviour:
       falseConditionAction: Block
       conditionPriority: 2
       outgoingLinks: []
-      conditionsString: 
+      conditionsString: Variable["RandomChoice"] == 2
       userScript: 
       onExecute:
         m_PersistentCalls:
@@ -1206,7 +1237,7 @@ MonoBehaviour:
       falseConditionAction: Block
       conditionPriority: 2
       outgoingLinks: []
-      conditionsString: 
+      conditionsString: Variable["RandomChoice"] == 1
       userScript: 
       onExecute:
         m_PersistentCalls:
@@ -1255,7 +1286,7 @@ MonoBehaviour:
       falseConditionAction: Block
       conditionPriority: 2
       outgoingLinks: []
-      conditionsString: 
+      conditionsString: Variable["RandomChoice"] == 2
       userScript: 
       onExecute:
         m_PersistentCalls:
@@ -1304,7 +1335,7 @@ MonoBehaviour:
       falseConditionAction: Block
       conditionPriority: 2
       outgoingLinks: []
-      conditionsString: 
+      conditionsString: Variable["RandomChoice"] == 3
       userScript: 
       onExecute:
         m_PersistentCalls:
@@ -1353,7 +1384,7 @@ MonoBehaviour:
       falseConditionAction: Block
       conditionPriority: 2
       outgoingLinks: []
-      conditionsString: 
+      conditionsString: Variable["RandomChoice"] == 3
       userScript: 
       onExecute:
         m_PersistentCalls:
@@ -1402,7 +1433,7 @@ MonoBehaviour:
       falseConditionAction: Block
       conditionPriority: 2
       outgoingLinks: []
-      conditionsString: 
+      conditionsString: Variable["RandomChoice"] == 5
       userScript: 
       onExecute:
         m_PersistentCalls:
@@ -1451,7 +1482,7 @@ MonoBehaviour:
       falseConditionAction: Block
       conditionPriority: 2
       outgoingLinks: []
-      conditionsString: 
+      conditionsString: Variable["RandomChoice"] == 3
       userScript: 
       onExecute:
         m_PersistentCalls:
@@ -1500,7 +1531,7 @@ MonoBehaviour:
       falseConditionAction: Block
       conditionPriority: 2
       outgoingLinks: []
-      conditionsString: 
+      conditionsString: Variable["RandomChoice"] == 4
       userScript: 
       onExecute:
         m_PersistentCalls:
@@ -1512,8 +1543,8 @@ MonoBehaviour:
         width: 160
         height: 30
     entryGroups: []
-    canvasScrollPosition: {x: 10.588257, y: 0}
+    canvasScrollPosition: {x: 0, y: 0}
-    canvasZoom: 0.8500002
+    canvasZoom: 0.70000035
   - id: 4
     fields:
     - title: Title
@@ -1617,7 +1648,10 @@ MonoBehaviour:
         isConnector: 0
         priority: 2
       conditionsString: 
-      userScript: 
+      userScript: 'local randomValue = math.random(1, 3)
+
+        Variable["RandomChoice"]
+        = randomValue'
       onExecute:
         m_PersistentCalls:
           m_Calls: []
@@ -1665,7 +1699,7 @@ MonoBehaviour:
       falseConditionAction: Block
       conditionPriority: 2
       outgoingLinks: []
-      conditionsString: 
+      conditionsString: Variable["RandomChoice"] == 1
       userScript: 
       onExecute:
         m_PersistentCalls:
@@ -1714,7 +1748,7 @@ MonoBehaviour:
       falseConditionAction: Block
       conditionPriority: 2
       outgoingLinks: []
-      conditionsString: 
+      conditionsString: Variable["RandomChoice"] == 2
       userScript: 
       onExecute:
         m_PersistentCalls:
@@ -1763,7 +1797,7 @@ MonoBehaviour:
       falseConditionAction: Block
       conditionPriority: 2
       outgoingLinks: []
-      conditionsString: 
+      conditionsString: Variable["RandomChoice"] == 3
       userScript: 
       onExecute:
         m_PersistentCalls:

Assets/BlueWater.asset

@@ -235,6 +235,18 @@ MonoBehaviour:
         destinationDialogueID: 3
         isConnector: 0
         priority: 2
+      - originConversationID: 1
+        originDialogueID: 0
+        destinationConversationID: 1
+        destinationDialogueID: 4
+        isConnector: 0
+        priority: 2
+      - originConversationID: 1
+        originDialogueID: 0
+        destinationConversationID: 1
+        destinationDialogueID: 5
+        isConnector: 0
+        priority: 2
       conditionsString: 
       userScript: 'local randomValue = math.random(1, 3)
 
@@ -343,8 +355,8 @@ MonoBehaviour:
           m_Calls: []
       canvasRect:
         serializedVersion: 2
-        x: 288
+        x: 293.59998
-        y: 134
+        y: 132.39998
         width: 160
         height: 30
     - id: 3
@@ -396,6 +408,104 @@ MonoBehaviour:
         y: 134
         width: 160
         height: 30
+    - id: 4
+      fields:
+      - title: Title
+        value: 
+        type: 0
+        typeString: 
+      - title: Description
+        value: 
+        type: 0
+        typeString: 
+      - title: Actor
+        value: 2
+        type: 5
+        typeString: CustomFieldType_Actor
+      - title: Conversant
+        value: 2
+        type: 5
+        typeString: CustomFieldType_Actor
+      - title: Menu Text
+        value: 
+        type: 0
+        typeString: 
+      - title: Dialogue Text
+        value: "\uADF8\uB807\uAC8C \uB561\uAE30\uB294 \uC74C\uC2DD\uC740 \uC5C6\uB294\uB370?"
+        type: 0
+        typeString: 
+      - title: Sequence
+        value: 
+        type: 0
+        typeString: 
+      conversationID: 1
+      isRoot: 0
+      isGroup: 0
+      nodeColor: 
+      delaySimStatus: 0
+      falseConditionAction: Block
+      conditionPriority: 2
+      outgoingLinks: []
+      conditionsString: 
+      userScript: 
+      onExecute:
+        m_PersistentCalls:
+          m_Calls: []
+      canvasRect:
+        serializedVersion: 2
+        x: 100.99997
+        y: 264.80002
+        width: 160
+        height: 30
+    - id: 5
+      fields:
+      - title: Title
+        value: 
+        type: 0
+        typeString: 
+      - title: Description
+        value: 
+        type: 0
+        typeString: 
+      - title: Actor
+        value: 2
+        type: 5
+        typeString: CustomFieldType_Actor
+      - title: Conversant
+        value: 2
+        type: 5
+        typeString: CustomFieldType_Actor
+      - title: Menu Text
+        value: 
+        type: 0
+        typeString: 
+      - title: Dialogue Text
+        value: "\uC74C\uC2DD \uBA54\uB274\uAC00 \uBA87 \uAC1C \uC5C6\uAD6C\uBA3C.."
+        type: 0
+        typeString: 
+      - title: Sequence
+        value: 
+        type: 0
+        typeString: 
+      conversationID: 1
+      isRoot: 0
+      isGroup: 0
+      nodeColor: 
+      delaySimStatus: 0
+      falseConditionAction: Block
+      conditionPriority: 2
+      outgoingLinks: []
+      conditionsString: 
+      userScript: 
+      onExecute:
+        m_PersistentCalls:
+          m_Calls: []
+      canvasRect:
+        serializedVersion: 2
+        x: 455.40002
+        y: 265.6
+        width: 160
+        height: 30
     entryGroups: []
     canvasScrollPosition: {x: 1, y: 20}
     canvasZoom: 1
@@ -501,6 +611,12 @@ MonoBehaviour:
         destinationDialogueID: 3
         isConnector: 0
         priority: 2
+      - originConversationID: 2
+        originDialogueID: 0
+        destinationConversationID: 2
+        destinationDialogueID: 4
+        isConnector: 0
+        priority: 2
       conditionsString: 
       userScript: 'local randomValue = math.random(1, 3)
 
@@ -662,6 +778,56 @@ MonoBehaviour:
         y: 170
         width: 160
         height: 30
+    - id: 4
+      fields:
+      - title: Title
+        value: 
+        type: 0
+        typeString: 
+      - title: Description
+        value: 
+        type: 0
+        typeString: 
+      - title: Actor
+        value: 2
+        type: 5
+        typeString: CustomFieldType_Actor
+      - title: Conversant
+        value: 2
+        type: 5
+        typeString: CustomFieldType_Actor
+      - title: Menu Text
+        value: 
+        type: 0
+        typeString: 
+      - title: Dialogue Text
+        value: "\uC74C\uC2DD \uB098\uC624\uB294\uB370 \uB108\uBB34 \uC624\uB798 \uAC78\uB9AC\uB124..
+          \uADF8\uB0E5 \uC9D1\uC5D0 \uAC08\uAE4C?"
+        type: 0
+        typeString: 
+      - title: Sequence
+        value: 
+        type: 0
+        typeString: 
+      conversationID: 2
+      isRoot: 0
+      isGroup: 0
+      nodeColor: 
+      delaySimStatus: 0
+      falseConditionAction: Block
+      conditionPriority: 2
+      outgoingLinks: []
+      conditionsString: 
+      userScript: 
+      onExecute:
+        m_PersistentCalls:
+          m_Calls: []
+      canvasRect:
+        serializedVersion: 2
+        x: 433.8
+        y: 244.99998
+        width: 160
+        height: 30
     entryGroups: []
     canvasScrollPosition: {x: 0, y: 0}
     canvasZoom: 1
@@ -1543,8 +1709,8 @@ MonoBehaviour:
         width: 160
         height: 30
     entryGroups: []
-    canvasScrollPosition: {x: 0, y: 0}
+    canvasScrollPosition: {x: 466.93515, y: 207.09439}
-    canvasZoom: 0.70000035
+    canvasZoom: 0.6700003
   - id: 4
     fields:
     - title: Title