5/27更新

WalkDogs场景添加2个镜头分开显示
修正领养狗的显示效果问题

Assets/Packages/Red_Deer/Cartoon_Animals/Cartoon_Dogs/Cartoon_ShibaInu/Materials/CT_ShibaInu_mobile_2.mat

@@ -25,9 +25,7 @@ Material:
   m_Parent: {fileID: 0}
   m_ModifiedSerializedProperties: 0
   m_ValidKeywords:
-  - _GLOSSINESS_FROM_BASE_ALPHA
   - _NORMALMAP
-  - _SPECULAR_COLOR
   m_InvalidKeywords: []
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 0
@@ -66,7 +64,7 @@ Material:
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
     - _MainTex:
-        m_Texture: {fileID: 0}
+        m_Texture: {fileID: 2800000, guid: 32389e287e2da4e4bb4c4ab4444330c6, type: 3}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
     - _MetallicGlossMap:

Assets/Packages/Red_Deer/Cartoon_Animals/Cartoon_Dogs/Cartoon_ShibaInu/Materials/CT_ShibaInu_mobile_3.mat

@@ -12,9 +12,7 @@ Material:
   m_Parent: {fileID: 0}
   m_ModifiedSerializedProperties: 0
   m_ValidKeywords:
-  - _GLOSSINESS_FROM_BASE_ALPHA
   - _NORMALMAP
-  - _SPECULAR_COLOR
   m_InvalidKeywords: []
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 0
@@ -53,7 +51,7 @@ Material:
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
     - _MainTex:
-        m_Texture: {fileID: 0}
+        m_Texture: {fileID: 2800000, guid: 75ed9af759bdaf140bc99fd6988ea7de, type: 3}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
     - _MetallicGlossMap:

Assets/Packages/Red_Deer/Cartoon_Animals/Cartoon_Dogs/Cartoon_ShibaInu/Materials/CT_ShibaInu_mobile_4.mat

@@ -25,9 +25,7 @@ Material:
   m_Parent: {fileID: 0}
   m_ModifiedSerializedProperties: 0
   m_ValidKeywords:
-  - _GLOSSINESS_FROM_BASE_ALPHA
   - _NORMALMAP
-  - _SPECULAR_COLOR
   m_InvalidKeywords: []
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 0
@@ -66,7 +64,7 @@ Material:
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
     - _MainTex:
-        m_Texture: {fileID: 0}
+        m_Texture: {fileID: 2800000, guid: 7cc0fb483b5a2d84994919baf8a52f92, type: 3}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
     - _MetallicGlossMap:

Assets/Resources/Dog/AnimatorController/shibaInu/HomeDogInteractController.controller

@@ -280,13 +280,13 @@ AnimatorStateMachine:
     m_Position: {x: 670, y: 160, z: 0}
   - serializedVersion: 1
     m_State: {fileID: -1898261574974550075}
-    m_Position: {x: 690, y: 250, z: 0}
+    m_Position: {x: 750, y: 240, z: 0}
   - serializedVersion: 1
     m_State: {fileID: 1879509632108041412}
     m_Position: {x: 500, y: -120, z: 0}
   - serializedVersion: 1
     m_State: {fileID: 605629613261180730}
-    m_Position: {x: 710, y: 350, z: 0}
+    m_Position: {x: 750, y: 330, z: 0}
   - serializedVersion: 1
     m_State: {fileID: -2450543374366050217}
     m_Position: {x: 460, y: 740, z: 0}

Assets/Resources/Shopping/ShoppingController.cs

@@ -308,7 +308,7 @@ public class ShoppingController : MonoBehaviour
             // 弹出窗户提示购买成功
             string msg = GameTool.GetValueAtPath(EnviromentSetting.languageData, new string[] { "shoppingUI", "message", "purchase_success", EnviromentSetting.languageCode });
             msg = msg.Replace("<<item_name>>", selectedItemDesc);
-            MessageBoxController.ShowMessage(msg);
+            MessageBoxController.ShowMessage(msg, BackBtnClick);
         }
         else
         {

Assets/Scenes/WalkDogs.unity

@@ -119,6 +119,307 @@ NavMeshSettings:
     debug:
       m_Flags: 0
   m_NavMeshData: {fileID: 0}
+--- !u!1001 &549612795
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    serializedVersion: 3
+    m_TransformParent: {fileID: 0}
+    m_Modifications:
+    - target: {fileID: 120287618883307676, guid: e51809b7ef307dd49be010f1bb5dadc2, type: 3}
+      propertyPath: m_Layer
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 164694981121520484, guid: e51809b7ef307dd49be010f1bb5dadc2, type: 3}
+      propertyPath: m_Layer
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 171881106959757638, guid: e51809b7ef307dd49be010f1bb5dadc2, type: 3}
+      propertyPath: m_Layer
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 609778633445035480, guid: e51809b7ef307dd49be010f1bb5dadc2, type: 3}
+      propertyPath: m_Layer
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1109118012110045454, guid: e51809b7ef307dd49be010f1bb5dadc2, type: 3}
+      propertyPath: m_Layer
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1216275718561849494, guid: e51809b7ef307dd49be010f1bb5dadc2, type: 3}
+      propertyPath: m_Layer
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1306704394329724910, guid: e51809b7ef307dd49be010f1bb5dadc2, type: 3}
+      propertyPath: m_Layer
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1499967821206834083, guid: e51809b7ef307dd49be010f1bb5dadc2, type: 3}
+      propertyPath: m_Name
+      value: dog(not use)
+      objectReference: {fileID: 0}
+    - target: {fileID: 1499967821206834083, guid: e51809b7ef307dd49be010f1bb5dadc2, type: 3}
+      propertyPath: m_Layer
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1499967821206834083, guid: e51809b7ef307dd49be010f1bb5dadc2, type: 3}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1841919266960408406, guid: e51809b7ef307dd49be010f1bb5dadc2, type: 3}
+      propertyPath: m_Layer
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2033376533168251059, guid: e51809b7ef307dd49be010f1bb5dadc2, type: 3}
+      propertyPath: m_Layer
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2237760756106213840, guid: e51809b7ef307dd49be010f1bb5dadc2, type: 3}
+      propertyPath: m_Layer
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2277454056521503001, guid: e51809b7ef307dd49be010f1bb5dadc2, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2277454056521503001, guid: e51809b7ef307dd49be010f1bb5dadc2, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2277454056521503001, guid: e51809b7ef307dd49be010f1bb5dadc2, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2277454056521503001, guid: e51809b7ef307dd49be010f1bb5dadc2, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 2277454056521503001, guid: e51809b7ef307dd49be010f1bb5dadc2, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2277454056521503001, guid: e51809b7ef307dd49be010f1bb5dadc2, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2277454056521503001, guid: e51809b7ef307dd49be010f1bb5dadc2, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2277454056521503001, guid: e51809b7ef307dd49be010f1bb5dadc2, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2277454056521503001, guid: e51809b7ef307dd49be010f1bb5dadc2, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2277454056521503001, guid: e51809b7ef307dd49be010f1bb5dadc2, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2396039031176427187, guid: e51809b7ef307dd49be010f1bb5dadc2, type: 3}
+      propertyPath: m_Layer
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2435953050213000698, guid: e51809b7ef307dd49be010f1bb5dadc2, type: 3}
+      propertyPath: m_Layer
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2554254634026994743, guid: e51809b7ef307dd49be010f1bb5dadc2, type: 3}
+      propertyPath: m_Layer
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2672582851592724379, guid: e51809b7ef307dd49be010f1bb5dadc2, type: 3}
+      propertyPath: m_Layer
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2803962576478956150, guid: e51809b7ef307dd49be010f1bb5dadc2, type: 3}
+      propertyPath: m_Layer
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2886163756499673595, guid: e51809b7ef307dd49be010f1bb5dadc2, type: 3}
+      propertyPath: m_Layer
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3285335132493414006, guid: e51809b7ef307dd49be010f1bb5dadc2, type: 3}
+      propertyPath: m_Layer
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3309930299839668821, guid: e51809b7ef307dd49be010f1bb5dadc2, type: 3}
+      propertyPath: m_Layer
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3362132461061614697, guid: e51809b7ef307dd49be010f1bb5dadc2, type: 3}
+      propertyPath: m_Layer
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3579511567652637515, guid: e51809b7ef307dd49be010f1bb5dadc2, type: 3}
+      propertyPath: m_Layer
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3694787026593277459, guid: e51809b7ef307dd49be010f1bb5dadc2, type: 3}
+      propertyPath: m_Layer
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3723020495090832408, guid: e51809b7ef307dd49be010f1bb5dadc2, type: 3}
+      propertyPath: m_Layer
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3744159693837650508, guid: e51809b7ef307dd49be010f1bb5dadc2, type: 3}
+      propertyPath: m_Layer
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3913752790425902266, guid: e51809b7ef307dd49be010f1bb5dadc2, type: 3}
+      propertyPath: m_Layer
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3981867718657994749, guid: e51809b7ef307dd49be010f1bb5dadc2, type: 3}
+      propertyPath: m_Layer
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4454822934431872713, guid: e51809b7ef307dd49be010f1bb5dadc2, type: 3}
+      propertyPath: m_Layer
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4478122301651849446, guid: e51809b7ef307dd49be010f1bb5dadc2, type: 3}
+      propertyPath: m_Layer
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4668296101216292445, guid: e51809b7ef307dd49be010f1bb5dadc2, type: 3}
+      propertyPath: m_Layer
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4719608363327771568, guid: e51809b7ef307dd49be010f1bb5dadc2, type: 3}
+      propertyPath: m_Layer
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5147581017703909367, guid: e51809b7ef307dd49be010f1bb5dadc2, type: 3}
+      propertyPath: m_Layer
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5218511316109271804, guid: e51809b7ef307dd49be010f1bb5dadc2, type: 3}
+      propertyPath: m_Layer
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5519564241998382276, guid: e51809b7ef307dd49be010f1bb5dadc2, type: 3}
+      propertyPath: m_Layer
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5862338613675198865, guid: e51809b7ef307dd49be010f1bb5dadc2, type: 3}
+      propertyPath: m_Layer
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5876904242000729818, guid: e51809b7ef307dd49be010f1bb5dadc2, type: 3}
+      propertyPath: m_Layer
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5878883621367985091, guid: e51809b7ef307dd49be010f1bb5dadc2, type: 3}
+      propertyPath: m_Layer
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6152528056191021882, guid: e51809b7ef307dd49be010f1bb5dadc2, type: 3}
+      propertyPath: m_Layer
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6235860088802772853, guid: e51809b7ef307dd49be010f1bb5dadc2, type: 3}
+      propertyPath: m_Layer
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6344917723248407000, guid: e51809b7ef307dd49be010f1bb5dadc2, type: 3}
+      propertyPath: m_Layer
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6353735459626149803, guid: e51809b7ef307dd49be010f1bb5dadc2, type: 3}
+      propertyPath: m_Layer
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6553942858011625894, guid: e51809b7ef307dd49be010f1bb5dadc2, type: 3}
+      propertyPath: m_Layer
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6609779806542303494, guid: e51809b7ef307dd49be010f1bb5dadc2, type: 3}
+      propertyPath: m_Layer
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6640014721966396943, guid: e51809b7ef307dd49be010f1bb5dadc2, type: 3}
+      propertyPath: m_Layer
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6752230202578772684, guid: e51809b7ef307dd49be010f1bb5dadc2, type: 3}
+      propertyPath: m_Layer
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6784132104636086323, guid: e51809b7ef307dd49be010f1bb5dadc2, type: 3}
+      propertyPath: m_Layer
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6843791965712573334, guid: e51809b7ef307dd49be010f1bb5dadc2, type: 3}
+      propertyPath: m_Layer
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6847755143628603450, guid: e51809b7ef307dd49be010f1bb5dadc2, type: 3}
+      propertyPath: m_Layer
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7046384064611662331, guid: e51809b7ef307dd49be010f1bb5dadc2, type: 3}
+      propertyPath: m_Layer
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7060669635252941090, guid: e51809b7ef307dd49be010f1bb5dadc2, type: 3}
+      propertyPath: m_Layer
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7173000098356983393, guid: e51809b7ef307dd49be010f1bb5dadc2, type: 3}
+      propertyPath: m_Layer
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7349998261521742155, guid: e51809b7ef307dd49be010f1bb5dadc2, type: 3}
+      propertyPath: m_Layer
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7387661010156388561, guid: e51809b7ef307dd49be010f1bb5dadc2, type: 3}
+      propertyPath: m_Layer
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7691374401860726999, guid: e51809b7ef307dd49be010f1bb5dadc2, type: 3}
+      propertyPath: m_Layer
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7695254272987550343, guid: e51809b7ef307dd49be010f1bb5dadc2, type: 3}
+      propertyPath: m_Layer
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7868069702632173184, guid: e51809b7ef307dd49be010f1bb5dadc2, type: 3}
+      propertyPath: m_Layer
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7968659083934154091, guid: e51809b7ef307dd49be010f1bb5dadc2, type: 3}
+      propertyPath: m_Layer
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8071071201870473286, guid: e51809b7ef307dd49be010f1bb5dadc2, type: 3}
+      propertyPath: m_Layer
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8394076247234921119, guid: e51809b7ef307dd49be010f1bb5dadc2, type: 3}
+      propertyPath: m_Layer
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8534941948287306178, guid: e51809b7ef307dd49be010f1bb5dadc2, type: 3}
+      propertyPath: m_Layer
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8827236052194162163, guid: e51809b7ef307dd49be010f1bb5dadc2, type: 3}
+      propertyPath: m_Layer
+      value: 0
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+    m_RemovedGameObjects: []
+    m_AddedGameObjects: []
+    m_AddedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: e51809b7ef307dd49be010f1bb5dadc2, type: 3}
 --- !u!1 &586495880
 GameObject:
   m_ObjectHideFlags: 0
@@ -406,7 +707,7 @@ Transform:
   m_GameObject: {fileID: 844310270}
   serializedVersion: 2
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: -2, z: 5.1}
+  m_LocalPosition: {x: 0, y: -2, z: 5.66}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 1
   m_Children: []
@@ -492,8 +793,8 @@ Camera:
   m_GameObject: {fileID: 992489242}
   m_Enabled: 1
   serializedVersion: 2
-  m_ClearFlags: 1
-  m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0}
+  m_ClearFlags: 2
+  m_BackGroundColor: {r: 0.759434, g: 1, b: 0.90276265, a: 0.14117648}
   m_projectionMatrixMode: 1
   m_GateFitMode: 2
   m_FOVAxisMode: 0
@@ -513,13 +814,13 @@ Camera:
     x: 0
     y: 0
     width: 1
-    height: 1
+    height: 0.3
   near clip plane: 0.3
-  far clip plane: 1000
+  far clip plane: 4
   field of view: 60
   orthographic: 0
   orthographic size: 5
-  m_Depth: 0
+  m_Depth: 1
   m_CullingMask:
     serializedVersion: 2
     m_Bits: 128
@@ -543,7 +844,56 @@ Transform:
   m_GameObject: {fileID: 992489242}
   serializedVersion: 2
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: -3.5}
+  m_LocalPosition: {x: 0, y: -1.97, z: 2.57}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 0}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &1004091922
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1004091924}
+  - component: {fileID: 1004091923}
+  m_Layer: 0
+  m_Name: Player
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!114 &1004091923
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1004091922}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 36c6647456e97cf4dafb6e0b44866c83, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  position: {x: 0, y: 0, z: 0}
+  rotation: {x: 0, y: 0, z: 0}
+  scale: {x: 1, y: 1, z: 1}
+  dogDisplayName: 
+  loadAllDogs: 1
+--- !u!4 &1004091924
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1004091922}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: -0.94420075, y: 1.5000004, z: -0.8245839}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
@@ -562,7 +912,7 @@ GameObject:
   - component: {fileID: 1374855188}
   - component: {fileID: 1374855189}
   - component: {fileID: 1374855190}
-  m_Layer: 0
+  m_Layer: 7
   m_Name: 2D Game Controller
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -767,6 +1117,7 @@ GameObject:
   - component: {fileID: 1449772402}
   - component: {fileID: 1449772401}
   - component: {fileID: 1449772404}
+  - component: {fileID: 1449772405}
   m_Layer: 0
   m_Name: Main Camera
   m_TagString: MainCamera
@@ -810,15 +1161,15 @@ Camera:
   m_NormalizedViewPortRect:
     serializedVersion: 2
     x: 0
-    y: 0
+    y: 0.3
     width: 1
     height: 1
   near clip plane: 0.3
-  far clip plane: 1000
+  far clip plane: 20
   field of view: 60
   orthographic: 0
   orthographic size: 5
-  m_Depth: -1
+  m_Depth: 0
   m_CullingMask:
     serializedVersion: 2
     m_Bits: 119
@@ -892,6 +1243,18 @@ MonoBehaviour:
     m_MipBias: 0
     m_VarianceClampScale: 0.9
     m_ContrastAdaptiveSharpening: 0
+--- !u!114 &1449772405
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1449772400}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 0cf1c61d68f2a7842bebe048adbcbdfd, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
 --- !u!1 &1903911474
 GameObject:
   m_ObjectHideFlags: 0
@@ -1024,3 +1387,5 @@ SceneRoots:
   - {fileID: 586495882}
   - {fileID: 844310272}
   - {fileID: 1374855187}
+  - {fileID: 1004091924}
+  - {fileID: 549612795}

Assets/Scripts/Develop Script/TestSetup.cs

@@ -7,17 +7,22 @@ public class TestSetup : MonoBehaviour
 
     void Awake()
     {
-        if (SceneManager.GetActiveScene().name == "Bathroom")
+        if (SceneManager.GetActiveScene().name == "WalkDogs")
         {
             // 初始化狗数据用于测试
-            //DogProperty puppy = new DogProperty();
-            //puppy.d_id = "043341045";
-            //UserProperty.dogs.Clear();
-            //UserProperty.dogs.Add(puppy);
-            //UserProperty.userId = "JTYNZP9O";
-            //EnviromentSetting.accessToken = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VyX2lkIjoiSlRZTlpQOU8iLCJleHAiOjE3NDI0Nzg5OTB9._br_Yd7xn6m2Nc078MEn3T7r-B7IYEjhVJY-H46Ob5E";
-            //EnviromentSetting.accessTokenReceivedTime = DateTime.Now;
-            //GameData.bathItemId = "other_00001";
+            DogProperty puppy = new DogProperty();
+            puppy.d_id = "043341045";
+            puppy.dog_name = "测试狗";
+            UserProperty.dogs.Clear();
+            UserProperty.dogs.Add(puppy);
+            UserProperty.userId = "JTYNZP9O";
+            EnviromentSetting.accessToken = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VyX2lkIjoiSlRZTlpQOU8iLCJleHAiOjE3NDI0Nzg5OTB9._br_Yd7xn6m2Nc078MEn3T7r-B7IYEjhVJY-H46Ob5E";
+            EnviromentSetting.accessTokenReceivedTime = DateTime.Now;
+
+            DogProperty puppy2 = new DogProperty();
+            puppy2.d_id = "043341046";
+            puppy2.dog_name = "测试狗2";
+            UserProperty.dogs.Add(puppy2);
         }
         if (SceneManager.GetActiveScene().name == "Home")
         {
@@ -58,13 +63,13 @@ public class TestSetup : MonoBehaviour
     {
         if (SceneManager.GetActiveScene().name == "Login")
         {
-            PlayerPrefs.SetString("LoginToken", "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VyX2lkIjoiSlRZTlpQOU8iLCJleHAiOjE3NTY1NDUxNzd9.oQgjY_6ZHJVYaYxh2b_LMIkUaCJ9FX8UpxpHOt_yLg8");
-            DateTime now = DateTime.Now;
-            DateTime oneHourAgo = now.AddHours(-1);
-            PlayerPrefs.SetString("LoginTokenTime", oneHourAgo.ToString());
-            EnviromentSetting.UUID = "abc";
+            // PlayerPrefs.SetString("LoginToken", "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VyX2lkIjoiSlRZTlpQOU8iLCJleHAiOjE3NTY1NDUxNzd9.oQgjY_6ZHJVYaYxh2b_LMIkUaCJ9FX8UpxpHOt_yLg8");
+            // DateTime now = DateTime.Now;
+            // DateTime oneHourAgo = now.AddHours(-1);
+            // PlayerPrefs.SetString("LoginTokenTime", oneHourAgo.ToString());
+            // EnviromentSetting.UUID = "abc";
 
-            // PlayerPrefs.DeleteAll();
+            PlayerPrefs.DeleteAll();
             // EnviromentSetting.languageCode = "en";
         }
 

Assets/Scripts/GameControllers/DogInitialize.cs

@@ -18,7 +18,7 @@ public class DogInitialize: MonoBehaviour {
     // Start is called once before the first execution of Update after the MonoBehaviour is created
     void Start()
     {
-        int maxDogQty = 3;      // 限制最大狗的数量
+        int maxDogQty = EnviromentSetting.maxDogQty;      // 限制最大狗的数量
         while (UserProperty.dogs.Count > maxDogQty)
         {
             UserProperty.dogs.RemoveAt(UserProperty.dogs.Count - 1);

Assets/Scripts/Login/CreateOrAdopt.cs

@@ -195,15 +195,18 @@ public class CreateOrAdopt : MonoBehaviour
 
     private void SubmitQRCodeCallback(string json)
     {
-        Debug.Log("QuickStartCallback: " + json);
         var data = JsonConvert.DeserializeObject<Dictionary<string, object>>(json);
         // 处理返回的结果
         if (data != null && data["status"].ToString() == "success")
         {
             // 成功处理逻辑
+            string user_info = data["user_info"].ToString();
+            UserProperty.FreshUserInfo(user_info);
+            string dog_list = data["dog_list"].ToString();
+            UserProperty.FreshDogInfo(dog_list);
             string msg = GameTool.GetValueAtPath(EnviromentSetting.languageData, new string[] { "InitDogUI", "message", "receive_success", EnviromentSetting.languageCode });
             msg = msg.Replace("<<dog_name>>", data["dog_name"].ToString());
-            MessageBoxController.ShowMessage(msg, () => AdoptionSuccessHandler());
+            MessageBoxController.ShowMessage(msg, () => SceneManager.LoadScene("Home"));
         }
         else
         {

Assets/Scripts/Playground/PlayToyController.cs

@@ -59,7 +59,7 @@ public class PlayToyController : MonoBehaviour
         toy.name = "toy";
         toy.tag = "Throw Material";
         toy.transform.localPosition = new Vector3(-0.1f, 0.66f, -10.8f);
-        toy.transform.localRotation = Quaternion.Euler(-115f,0,0);
+        toy.transform.localRotation = Quaternion.Euler(-115f, 0, 0);
         toy.transform.localScale = new Vector3(0.75f, 0.75f, 0.75f);       // 初始化位置
 
         // 配置material
@@ -114,7 +114,7 @@ public class PlayToyController : MonoBehaviour
                 }
             }
 
-            
+
         }
 
         // 松开鼠标
@@ -133,7 +133,7 @@ public class PlayToyController : MonoBehaviour
             yForce = (mouseEndPosition.y - mouseStartPosition.y) / throwTime / forceAdjust * aspectRatio;
             Debug.Log("xForce is: " + xForce);
             Debug.Log("yForce is: " + yForce);
-            if (yForce > 1 && yForce > xForce*0.5f) // 确保是向前飞出飞盘
+            if (yForce > 1 && yForce > xForce * 0.5f) // 确保是向前飞出飞盘
             {
                 AddThrowForce();
             }
@@ -162,7 +162,7 @@ public class PlayToyController : MonoBehaviour
         {
             return;
         }
-        
+
     }
 
     // 飞碟飞出后，狗追逐飞碟
@@ -175,8 +175,8 @@ public class PlayToyController : MonoBehaviour
         var dog = GameObject.Find("dog");
         var toy = GameObject.Find("toy");
         DogProperty dogProperty = UserProperty.dogs[0]; // 读取狗的数据
-        //float turnSpeed = 90.0f; // 每秒最多旋转角度
-    //dog.transform.LookAt(fisbee.transform.position);
+                                                        //float turnSpeed = 90.0f; // 每秒最多旋转角度
+                                                        //dog.transform.LookAt(fisbee.transform.position);
 
         if (toy.transform.position.y < 0.43 && PlayData.gameStatus == PlayData.GameStatus.inProgress)
         {
@@ -231,7 +231,7 @@ public class PlayToyController : MonoBehaviour
         textValue = GameTool.GetValueAtPath(EnviromentSetting.languageData, new string[] { "playgroundUI", "button", "play_again", EnviromentSetting.languageCode });
         playagainBtn.text = textValue;
 
-        playagainBtn.clicked += ()=> GameReset();
+        playagainBtn.clicked += () => GameReset();
         confirmBtn.clicked += ConfirmBtnClick;
     }
 
@@ -352,8 +352,9 @@ public static class PlayData
 
     public static float throwDistance()
     {
-        if (gameStatus == GameStatus.finishSuccess) {
-            Debug.Log("start position is"+throwStartPoision);
+        if (gameStatus == GameStatus.finishSuccess)
+        {
+            Debug.Log("start position is" + throwStartPoision);
             Debug.Log("end position is" + throwEndPosition);
             return Vector3.Distance(throwEndPosition, throwStartPoision);
         }
@@ -368,6 +369,6 @@ public static class PlayData
         PlayData.isMouseStartOnTarget = false;  // 是否鼠标滑动开始在允许的目标上
         PlayData.throwStartPoision = Vector3.zero;
         PlayData.throwEndPosition = Vector3.zero;
-        PlayData.gameStatus = GameStatus.notStart ;
-}
+        PlayData.gameStatus = GameStatus.notStart;
+    }
 }