Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev

bin/json/game_rdtask.json

@@ -159,8 +159,7 @@
     ],
     "sidequest": [
       2009,
-      2010,
+      2010
-      2011
     ]
   },
   {
@@ -172,6 +171,7 @@
       101
     ],
     "sidequest": [
+      2011,
       2012
     ]
   },
@@ -184,7 +184,9 @@
       101
     ],
     "sidequest": [
-      2013
+      2013,
+      2014,
+      2015
     ]
   },
   {
@@ -196,7 +198,9 @@
       101
     ],
     "sidequest": [
-      2014
+      2016,
+      2017,
+      2018
     ]
   },
   {
@@ -208,7 +212,7 @@
       101
     ],
     "sidequest": [
-      2015
+      2019
     ]
   },
   {
@@ -220,7 +224,7 @@
       101
     ],
     "sidequest": [
-      2016
+      2020
     ]
   },
   {
@@ -232,7 +236,9 @@
       101
     ],
     "sidequest": [
-      2017
+      2021,
+      2022,
+      2023
     ]
   },
   {
@@ -244,7 +250,9 @@
       101
     ],
     "sidequest": [
-      2018
+      2024,
+      2025,
+      2026
     ]
   },
   {
@@ -256,7 +264,9 @@
       101
     ],
     "sidequest": [
-      2019
+      2027,
+      2028,
+      2029
     ]
   },
   {
@@ -268,19 +278,9 @@
       101
     ],
     "sidequest": [
-      2020
+      2030,
-    ]
+      2031,
-  },
+      2032
-  {
-    "id": 100217,
-    "group": 2,
-    "type": 2,
-    "preTid": 100216,
-    "condition": [
-      101
-    ],
-    "sidequest": [
-      2021
     ]
   }
 ]

bin/json/game_rdtaskchoose.json

@@ -3,10 +3,6 @@
     "id": 10001,
     "num": 1,
     "preTid": 0,
-    "Entity": [],
-    "EntityChange": [],
-    "EntityStateChange": [],
-    "EntityInteractive": [],
     "gotoLevel": 0,
     "needItem": [
       0
@@ -17,10 +13,6 @@
     "id": 10002,
     "num": 2,
     "preTid": 104,
-    "Entity": [],
-    "EntityChange": [],
-    "EntityStateChange": [],
-    "EntityInteractive": [],
     "gotoLevel": 0,
     "needItem": [
       0
@@ -31,10 +23,6 @@
     "id": 10003,
     "num": 1,
     "preTid": 0,
-    "Entity": [],
-    "EntityChange": [],
-    "EntityStateChange": [],
-    "EntityInteractive": [],
     "gotoLevel": 0,
     "needItem": [
       0
@@ -45,10 +33,6 @@
     "id": 10004,
     "num": 1,
     "preTid": 0,
-    "Entity": [],
-    "EntityChange": [],
-    "EntityStateChange": [],
-    "EntityInteractive": [],
     "gotoLevel": 0,
     "needItem": [
       0
@@ -59,10 +43,6 @@
     "id": 10005,
     "num": 2,
     "preTid": 105,
-    "Entity": [],
-    "EntityChange": [],
-    "EntityStateChange": [],
-    "EntityInteractive": [],
     "gotoLevel": 0,
     "needItem": [
       0
@@ -73,10 +53,6 @@
     "id": 10006,
     "num": 1,
     "preTid": 105,
-    "Entity": [],
-    "EntityChange": [],
-    "EntityStateChange": [],
-    "EntityInteractive": [],
     "gotoLevel": 0,
     "needItem": [
       0
@@ -87,10 +63,6 @@
     "id": 10007,
     "num": 2,
     "preTid": 0,
-    "Entity": [],
-    "EntityChange": [],
-    "EntityStateChange": [],
-    "EntityInteractive": [],
     "gotoLevel": 0,
     "needItem": [
       0
@@ -101,10 +73,6 @@
     "id": 10008,
     "num": 3,
     "preTid": 0,
-    "Entity": [],
-    "EntityChange": [],
-    "EntityStateChange": [],
-    "EntityInteractive": [],
     "gotoLevel": 0,
     "needItem": [
       0
@@ -115,14 +83,6 @@
     "id": 10009,
     "num": 1,
     "preTid": 0,
-    "Entity": [
-      "Earth"
-    ],
-    "EntityChange": [],
-    "EntityStateChange": [],
-    "EntityInteractive": [
-      false
-    ],
     "gotoLevel": 0,
     "needItem": [
       0
@@ -133,14 +93,6 @@
     "id": 100010,
     "num": 2,
     "preTid": 105,
-    "Entity": [
-      "Earth"
-    ],
-    "EntityChange": [],
-    "EntityStateChange": [],
-    "EntityInteractive": [
-      false
-    ],
     "gotoLevel": 0,
     "needItem": [
       0
@@ -151,14 +103,6 @@
     "id": 100011,
     "num": 1,
     "preTid": 0,
-    "Entity": [
-      "Earth"
-    ],
-    "EntityChange": [],
-    "EntityStateChange": [],
-    "EntityInteractive": [
-      false
-    ],
     "gotoLevel": 101,
     "needItem": [
       0
@@ -169,14 +113,6 @@
     "id": 100012,
     "num": 2,
     "preTid": 0,
-    "Entity": [
-      "Earth"
-    ],
-    "EntityChange": [],
-    "EntityStateChange": [],
-    "EntityInteractive": [
-      false
-    ],
     "gotoLevel": 0,
     "needItem": [
       0
@@ -186,13 +122,7 @@
   {
     "id": 20001,
     "num": 1,
-    "preTid": 104,
+    "preTid": 0,
-    "Entity": [
-      "Earth"
-    ],
-    "EntityChange": [],
-    "EntityStateChange": [],
-    "EntityInteractive": [],
     "gotoLevel": 0,
     "needItem": [
       0
@@ -203,12 +133,6 @@
     "id": 20002,
     "num": 2,
     "preTid": 0,
-    "Entity": [
-      "Earth"
-    ],
-    "EntityChange": [],
-    "EntityStateChange": [],
-    "EntityInteractive": [],
     "gotoLevel": 0,
     "needItem": [
       0
@@ -219,12 +143,6 @@
     "id": 20003,
     "num": 1,
     "preTid": 0,
-    "Entity": [
-      "Earth"
-    ],
-    "EntityChange": [],
-    "EntityStateChange": [],
-    "EntityInteractive": [],
     "gotoLevel": 0,
     "needItem": [
       0
@@ -235,12 +153,6 @@
     "id": 20004,
     "num": 1,
     "preTid": 0,
-    "Entity": [
-      "Earth"
-    ],
-    "EntityChange": [],
-    "EntityStateChange": [],
-    "EntityInteractive": [],
     "gotoLevel": 0,
     "needItem": [
       0
@@ -251,12 +163,6 @@
     "id": 20005,
     "num": 1,
     "preTid": 0,
-    "Entity": [
-      "Earth"
-    ],
-    "EntityChange": [],
-    "EntityStateChange": [],
-    "EntityInteractive": [],
     "gotoLevel": 0,
     "needItem": [
       0
@@ -267,12 +173,6 @@
     "id": 20006,
     "num": 1,
     "preTid": 0,
-    "Entity": [
-      "Earth"
-    ],
-    "EntityChange": [],
-    "EntityStateChange": [],
-    "EntityInteractive": [],
     "gotoLevel": 0,
     "needItem": [
       0
@@ -283,12 +183,6 @@
     "id": 20007,
     "num": 1,
     "preTid": 0,
-    "Entity": [
-      "Earth"
-    ],
-    "EntityChange": [],
-    "EntityStateChange": [],
-    "EntityInteractive": [],
     "gotoLevel": 0,
     "needItem": [
       0
@@ -299,12 +193,6 @@
     "id": 20008,
     "num": 1,
     "preTid": 0,
-    "Entity": [
-      "Earth"
-    ],
-    "EntityChange": [],
-    "EntityStateChange": [],
-    "EntityInteractive": [],
     "gotoLevel": 0,
     "needItem": [
       0
@@ -315,12 +203,6 @@
     "id": 20009,
     "num": 2,
     "preTid": 0,
-    "Entity": [
-      "Earth"
-    ],
-    "EntityChange": [],
-    "EntityStateChange": [],
-    "EntityInteractive": [],
     "gotoLevel": 0,
     "needItem": [
       0
@@ -331,28 +213,16 @@
     "id": 200010,
     "num": 2,
     "preTid": 0,
-    "Entity": [
-      "Earth"
-    ],
-    "EntityChange": [],
-    "EntityStateChange": [],
-    "EntityInteractive": [],
     "gotoLevel": 0,
     "needItem": [
       0
     ],
-    "nextTid": 100212
+    "nextTid": 100211
   },
   {
     "id": 200011,
     "num": 2,
     "preTid": 0,
-    "Entity": [
-      "Earth"
-    ],
-    "EntityChange": [],
-    "EntityStateChange": [],
-    "EntityInteractive": [],
     "gotoLevel": 0,
     "needItem": [
       0
@@ -363,12 +233,6 @@
     "id": 200012,
     "num": 2,
     "preTid": 0,
-    "Entity": [
-      "Earth"
-    ],
-    "EntityChange": [],
-    "EntityStateChange": [],
-    "EntityInteractive": [],
     "gotoLevel": 0,
     "needItem": [
       0
@@ -379,12 +243,6 @@
     "id": 200013,
     "num": 1,
     "preTid": 0,
-    "Entity": [
-      "Earth"
-    ],
-    "EntityChange": [],
-    "EntityStateChange": [],
-    "EntityInteractive": [],
     "gotoLevel": 0,
     "needItem": [
       0
@@ -395,12 +253,6 @@
     "id": 200014,
     "num": 1,
     "preTid": 0,
-    "Entity": [
-      "Earth"
-    ],
-    "EntityChange": [],
-    "EntityStateChange": [],
-    "EntityInteractive": [],
     "gotoLevel": 0,
     "needItem": [
       0
@@ -411,12 +263,6 @@
     "id": 200015,
     "num": 1,
     "preTid": 0,
-    "Entity": [
-      "Earth"
-    ],
-    "EntityChange": [],
-    "EntityStateChange": [],
-    "EntityInteractive": [],
     "gotoLevel": 0,
     "needItem": [
       0
@@ -427,16 +273,60 @@
     "id": 200016,
     "num": 1,
     "preTid": 0,
-    "Entity": [
-      "Earth"
-    ],
-    "EntityChange": [],
-    "EntityStateChange": [],
-    "EntityInteractive": [],
     "gotoLevel": 0,
     "needItem": [
       0
     ],
     "nextTid": 100217
+  },
+  {
+    "id": 200017,
+    "num": 1,
+    "preTid": 0,
+    "gotoLevel": 0,
+    "needItem": [
+      0
+    ],
+    "nextTid": 100212
+  },
+  {
+    "id": 200018,
+    "num": 1,
+    "preTid": 0,
+    "gotoLevel": 0,
+    "needItem": [
+      0
+    ],
+    "nextTid": 100213
+  },
+  {
+    "id": 200019,
+    "num": 1,
+    "preTid": 0,
+    "gotoLevel": 0,
+    "needItem": [
+      0
+    ],
+    "nextTid": 100215
+  },
+  {
+    "id": 200020,
+    "num": 1,
+    "preTid": 0,
+    "gotoLevel": 0,
+    "needItem": [
+      0
+    ],
+    "nextTid": 0
+  },
+  {
+    "id": 200021,
+    "num": 1,
+    "preTid": 0,
+    "gotoLevel": 0,
+    "needItem": [
+      0
+    ],
+    "nextTid": 100216
   }
 ]

bin/json/game_rdtaskcondi.json

@@ -53,7 +53,7 @@
     "id": 106,
     "datatype": 2,
     "type": 6,
-    "data1": 45003,
+    "data1": 25004,
     "data2": 4,
     "data3": 0,
     "data4": 0,

cmd/v2/lib/common/utils.go

@@ -88,6 +88,10 @@ func Copy(srcFile, destFile string) (int, error) {
 	return len(input), nil
 }
 
+func DeleteFile(filePath string) error {
+	return os.Remove(filePath)
+}
+
 func RemoveContents(dir string) error {
 	d, err := os.Open(dir)
 	if err != nil {

cmd/v2/ui/tool_gen.go

@@ -190,7 +190,14 @@ func (this *appGen) LazyInit(obs observer.Observer) error {
 				filepath.Join(projectDir.Text, outputCodeDir.Text, v))
 			if err != nil {
 				logrus.Error(err)
+				return
 			}
+
+			if err := common.DeleteFile(filepath.Join(tmpDir.Text, "go", v)); err != nil {
+				logrus.Error(err)
+				return
+			}
+
 			this.goList.deleteItem(v)
 		}
 	}
@@ -241,7 +248,6 @@ func (this *appGen) LazyInit(obs observer.Observer) error {
 		json_overrideBtn.Disable()
 		defer func() {
 			json_overrideBtn.Enable()
-			// _ = common.RemoveContents(filepath.Join(tmpDir.Text, "json"))
 		}()
 		for _, v := range this.jsonList.selItemIds {
 			// logrus.WithField("path1", filepath.Join(tmpDir.Text, "json", v)).Debug("copy json")
@@ -250,7 +256,14 @@ func (this *appGen) LazyInit(obs observer.Observer) error {
 				filepath.Join(projectDir.Text, outputJsonDir.Text, v))
 			if err != nil {
 				logrus.Error(err)
+				return
 			}
+
+			if err := common.DeleteFile(filepath.Join(tmpDir.Text, "json", v)); err != nil {
+				logrus.Error(err)
+				return
+			}
+
 			this.jsonList.deleteItem(v)
 		}
 	}
@@ -292,6 +305,10 @@ func (this *appGen) LazyInit(obs observer.Observer) error {
 		genBtn.Disable()
 		defer func() {
 			genBtn.Enable()
+			go_allCancelBtn.Show()
+			go_allSelBtn.Hide()
+			json_allCancelBtn.Show()
+			json_allSelBtn.Hide()
 		}()
 		if runtime.GOOS != "windows" {
 			dialog.ShowError(errors.New("no support "+runtime.GOOS), toolWin.w)

modules/rtask/api_dotask.go

@@ -67,7 +67,12 @@ func (this *apiComp) Apply(session comm.IUserSession, req *pb.RtaskApplyReq) (co
 		}
 
 		// 没有设置选项，表示任务完成
-		if sideConf.EndTid == -1 {
+		if len(sideConf.EndTid) == 0 {
+			code = pb.ErrorCode_ConfigurationException
+			return
+		}
+		
+		if sideConf.EndTid[0] == -1 {
 			frtaskArr.RtaskIds = append(frtaskArr.RtaskIds, req.RtaskId)
 			if rtask.FrtaskIds == nil {
 				rtask.FrtaskIds = make(map[int32]*pb.FrtaskIds)
@@ -84,10 +89,12 @@ func (this *apiComp) Apply(session comm.IUserSession, req *pb.RtaskApplyReq) (co
 
 		} else {
 			// 校验完成条件
-			if err, ok := this.moduleRtask.modelRtask.checkCondi(session.GetUserId(), sideConf.EndTid); !ok {
+			for _, v := range sideConf.EndTid {
-				this.moduleRtask.Error(err.Error())
+				if err, ok := this.moduleRtask.modelRtask.checkCondi(session.GetUserId(), v); !ok {
-				code = pb.ErrorCode_RtaskCondiNoReach
+					this.moduleRtask.Error(err.Error())
-				return
+					code = pb.ErrorCode_RtaskCondiNoReach
+					return
+				}
 			}
 		}
 	}

sys/configure/structs/Game.RdtaskSideData.go

@@ -26,10 +26,11 @@ type GameRdtaskSideData struct {
     Modelstate int32
     Popup string
     Special string
+    EnableAi bool
     Boxreplace string
     Timeline string
     ChooseId []int32
-    EndTid int32
+    EndTid []int32
     StoryEnd int32
     Reward []*GameChooseReward
     NextTid int32
@@ -116,6 +117,7 @@ func (_v *GameRdtaskSideData)Deserialize(_buf map[string]interface{}) (err error
     { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["modelstate"].(float64); !_ok_ { err = errors.New("modelstate error"); return }; _v.Modelstate = int32(_tempNum_) }
     { var _ok_ bool; if _v.Popup, _ok_ = _buf["popup"].(string); !_ok_ { err = errors.New("popup error"); return } }
     { var _ok_ bool; if _v.Special, _ok_ = _buf["special"].(string); !_ok_ { err = errors.New("special error"); return } }
+    { var _ok_ bool; if _v.EnableAi, _ok_ = _buf["enableAi"].(bool); !_ok_ { err = errors.New("enableAi error"); return } }
     { var _ok_ bool; if _v.Boxreplace, _ok_ = _buf["boxreplace"].(string); !_ok_ { err = errors.New("boxreplace error"); return } }
     { var _ok_ bool; if _v.Timeline, _ok_ = _buf["timeline"].(string); !_ok_ { err = errors.New("timeline error"); return } }
      {
@@ -132,7 +134,20 @@ func (_v *GameRdtaskSideData)Deserialize(_buf map[string]interface{}) (err error
                 }
             }
 
-    { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["endTid"].(float64); !_ok_ { err = errors.New("endTid error"); return }; _v.EndTid = int32(_tempNum_) }
+     {
+                var _arr_ []interface{}
+                var _ok_ bool
+                if _arr_, _ok_ = _buf["endTid"].([]interface{}); !_ok_ { err = errors.New("endTid error"); return }
+
+                _v.EndTid = make([]int32, 0, len(_arr_))
+                
+                for _, _e_ := range _arr_ {
+                    var _list_v_ int32
+                    { var _ok_ bool; var _x_ float64; if _x_, _ok_ = _e_.(float64); !_ok_ { err = errors.New("_list_v_ error"); return }; _list_v_ = int32(_x_) }
+                    _v.EndTid = append(_v.EndTid, _list_v_)
+                }
+            }
+
     { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["storyEnd"].(float64); !_ok_ { err = errors.New("storyEnd error"); return }; _v.StoryEnd = int32(_tempNum_) }
      {
                 var _arr_ []interface{}

sys/configure/structs/game.rdtaskChooseData.go

@@ -14,6 +14,7 @@ type GameRdtaskChooseData struct {
     Id int32
     Num int32
     PreTid int32
+    GotoLevel int32
     NeedItem []int32
     NextTid int32
 }
@@ -28,6 +29,7 @@ func (_v *GameRdtaskChooseData)Deserialize(_buf map[string]interface{}) (err err
     { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["id"].(float64); !_ok_ { err = errors.New("id error"); return }; _v.Id = int32(_tempNum_) }
     { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["num"].(float64); !_ok_ { err = errors.New("num error"); return }; _v.Num = int32(_tempNum_) }
     { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["preTid"].(float64); !_ok_ { err = errors.New("preTid error"); return }; _v.PreTid = int32(_tempNum_) }
+    { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["gotoLevel"].(float64); !_ok_ { err = errors.New("gotoLevel error"); return }; _v.GotoLevel = int32(_tempNum_) }
      {
                 var _arr_ []interface{}
                 var _ok_ bool