Merge branch 'tqxbqy' of http://192.168.1.20:10010/r/snxxz_resourcesout int...

cjc

2 天以前 e0792370fdbe3d7c6995ecac133c4d3bd681f58a

Merge branch 'tqxbqy' of http://192.168.1.20:10010/r/snxxz_resourcesout into tqxbqy

 Refdata/ScriptableObject/SoNewBieGuide/NewBieGuideStep_3201.asset

@@ -20,7 +20,7 @@
  UIElementPath: BaseCanvas/MainInterfaceWin/Widget_RightTop/Container_Function/Container_Top/BoxContainer/Line_1/Grid_11/Content/Btn_Daily
  tipContent: 
  selectBox: 1
  effect2: 0
  effect2: 7105
  voice: 0
  usherPosition: {x: -3000, y: -3000}
  usherOrientation: 1
@@ -28,3 +28,4 @@
  clickAnyWhereComplete: 0
  pointerDownComplete: 0
  clickOthersComplete: 1
  useWindow: 0

 Refdata/ScriptableObject/SoNewBieGuide/NewBieGuideStep_3301.asset

@@ -20,7 +20,7 @@
  UIElementPath: BaseCanvas/MainInterfaceWin/Widget_RightTop/Container_Function/Container_Top/BoxContainer/Line_1/Grid_11/Content/Btn_Daily
  tipContent: 
  selectBox: 1
  effect2: 0
  effect2: 7105
  voice: 0
  usherPosition: {x: -3000, y: -3000}
  usherOrientation: 1
@@ -28,3 +28,4 @@
  clickAnyWhereComplete: 0
  pointerDownComplete: 0
  clickOthersComplete: 1
  useWindow: 0

 Refdata/ScriptableObject/SoNewBieGuide/NewBieGuideStep_3401.asset

@@ -21,7 +21,7 @@
    View/Content/Main_@*
  tipContent: 
  selectBox: 1
  effect2: 3019
  effect2: 7105
  voice: 0
  usherPosition: {x: -3000, y: -3000}
  usherOrientation: 1

 Refdata/ScriptableObject/SoNewBieGuide/NewBieGuideStep_3501.asset

@@ -20,7 +20,7 @@
  UIElementPath: BaseCanvas/MainInterfaceWin/Widget_RightTop/Container_Function/Container_Top/BoxContainer/Line_1/Grid_11/Content/Btn_Daily
  tipContent: 
  selectBox: 1
  effect2: 0
  effect2: 7105
  voice: 0
  usherPosition: {x: -3000, y: -3000}
  usherOrientation: 1
@@ -28,3 +28,4 @@
  clickAnyWhereComplete: 0
  pointerDownComplete: 0
  clickOthersComplete: 1
  useWindow: 0

 Refdata/ScriptableObject/SoNewBieGuide/NewBieGuideStep_3701.asset

@@ -20,7 +20,7 @@
  UIElementPath: BaseCanvas/MainInterfaceWin/Widget_RightTop/Container_Function/Container_Top/BoxContainer/Line_1/Grid_11/Content/Btn_Daily
  tipContent: 
  selectBox: 1
  effect2: 0
  effect2: 7105
  voice: 0
  usherPosition: {x: -3000, y: -3000}
  usherOrientation: 1
@@ -28,3 +28,4 @@
  clickAnyWhereComplete: 0
  pointerDownComplete: 0
  clickOthersComplete: 1
  useWindow: 0

 Refdata/ScriptableObject/SoNewBieGuide/NewBieGuideStep_3801.asset

@@ -20,7 +20,7 @@
  UIElementPath: BaseCanvas/MainInterfaceWin/Widget_RightTop/Container_Function/Container_Top/BoxContainer/Line_1/Grid_13/Content/DaTreasureBtn
  tipContent: 
  selectBox: 1
  effect2: 0
  effect2: 7105
  voice: 0
  usherPosition: {x: -3000, y: -3000}
  usherOrientation: 1
@@ -28,3 +28,4 @@
  clickAnyWhereComplete: 0
  pointerDownComplete: 0
  clickOthersComplete: 1
  useWindow: 0

 Refdata/ScriptableObject/SoNewBieGuide/NewBieGuideStep_3901.asset

@@ -20,7 +20,7 @@
  UIElementPath: BaseCanvas/MainInterfaceWin/Widget_RightTop/Container_Function/Container_Top/BoxContainer/Line_1/Grid_13/Content/DaTreasureBtn
  tipContent: 
  selectBox: 1
  effect2: 0
  effect2: 7105
  voice: 0
  usherPosition: {x: -3000, y: -3000}
  usherOrientation: 1
@@ -28,3 +28,4 @@
  clickAnyWhereComplete: 0
  pointerDownComplete: 0
  clickOthersComplete: 1
  useWindow: 0

 Refdata/ScriptableObject/SoNewBieGuide/NewBieGuideStep_4001.asset

@@ -20,7 +20,7 @@
  UIElementPath: NormalCanvas/RealmWin/btns/Btn_GotoBoss
  tipContent: 
  selectBox: 1
  effect2: 0
  effect2: 7105
  voice: 0
  usherPosition: {x: -3000, y: -3000}
  usherOrientation: 0
@@ -28,3 +28,4 @@
  clickAnyWhereComplete: 0
  pointerDownComplete: 0
  clickOthersComplete: 1
  useWindow: 0