抽卡新规则

bin/json/game_global.json

@@ -364,6 +364,12 @@
       29,
       5
     ],
+    "DrawCard_5StarsInRange1": [
+      30,
+      49,
+      5
+    ],
+    "DrawCard_5StarsInRange1_pool": "base_pool7",
     "DrawCard_ContinuousRestriction_Star5": 20,
     "DrawCard_ContinuousRestriction_Camp": 2,
     "EquipmentConsumption": [
@@ -525,6 +531,8 @@
     "GuildBoss_MaxBuyNum": 5,
     "GuildBoss_troop2": 45,
     "GuildBoss_troop3": 60,
-    "zhayantime": 5
+    "zhayantime": 5,
+    "rotateAngle": 360,
+    "rotateDizzyTime": 1
   }
 ]

modules/hero/api_drawCard.go

@@ -29,7 +29,7 @@ func (this *apiComp) DrawCard(session comm.IUserSession, req *pb.HeroDrawCardReq
 		cfgDraw     *cfg.GameGlobalData
 		costAtn     *cfg.Gameatn
 		heroRecord  *pb.DBHeroRecord
-		pool        string
+		pool        string // 当前抽对应的卡池
 		_mapAddHero map[string]int32
 		strPool     []string // 10连跨多个卡池情况
 		update      map[string]interface{}
@@ -129,7 +129,56 @@ func (this *apiComp) DrawCard(session comm.IUserSession, req *pb.HeroDrawCardReq
 					}
 				}
 			}
-
+			inRangeConf1 := this.module.configure.GetGlobalConf().DrawCard5StarsInRange1
+			if len(inRangeConf1) == 3 {
+				iStart := inRangeConf1[0] // 抽卡开始
+				iEnd := inRangeConf1[1]   // 抽卡结束
+				star := inRangeConf1[2]
+				if star >= 3 { // 保底必须三星+
+					if heroRecord.Inevitable == 0 && heroRecord.Drawcount > iStart && heroRecord.Drawcount < iEnd && iEnd >= iStart {
+						n, _ := rand.Int(rand.Reader, big.NewInt(int64(iEnd-iStart)))
+						if n.Int64() < 1 { // 抽中
+							starIndex = star
+							heroRecord.Inevitable = heroRecord.Drawcount
+							update["inevitable1"] = heroRecord.Drawcount
+							szStar = append(szStar, star)
+							if star == 4 {
+								heroRecord.Star4 = 0
+								star4Max++
+							} else if star == 5 {
+								star5Max++
+								heroRecord.Star5 = 0
+							}
+							// 修改卡池
+							newPoll := this.module.configure.GetGlobalConf().DrawCard5StarsInRange1Pool
+							if newPoll != "" {
+								strPool[len(strPool)-1] = newPoll
+							}
+							continue
+						}
+					}
+					// 保底情况
+					if heroRecord.Drawcount == iEnd && heroRecord.Inevitable == 0 {
+						starIndex = star
+						heroRecord.Inevitable1 = heroRecord.Drawcount
+						update["inevitable1"] = heroRecord.Drawcount
+						szStar = append(szStar, star)
+						if star == 4 {
+							heroRecord.Star4 = 0
+							star4Max++
+						} else if star == 5 {
+							star5Max++
+							heroRecord.Star5 = 0
+						}
+						// 修改卡池
+						newPoll := this.module.configure.GetGlobalConf().DrawCard5StarsInRange1Pool
+						if newPoll != "" {
+							strPool[len(strPool)-1] = newPoll
+						}
+						continue
+					}
+				}
+			}
 			heroRecord.Star4++ // 4星保底数量+1
 			heroRecord.Star5++ // 5星保底数量+1
 			if starIndex == 1 {

modules/hero/hero_test.go

@@ -72,6 +72,12 @@ func GetMonthStartEnd() (int64, int64) {
 	return _d1, _d2
 }
 func Test_Main(t *testing.T) {
+
+	sz := make([]string, 0)
+	for i := 0; i < 10; i++ {
+		sz = append(sz, "1")
+	}
+	sz[len(sz)-1] = "xxxx"
 	//创建trace文件
 	f, err := os.Create("trace.out")
 	if err != nil {

modules/hero/module.go

@@ -770,3 +770,34 @@ func (this *Hero) SendTaskMsg(session comm.IUserSession, szStar []int32, drawCou
 	}
 	this.ModuleRtask.SendToRtask(session, comm.Rtype89, drawCount)
 }
+
+func (this Hero) newCondition(heroRecord *pb.DBHeroRecord) (get bool, starIndex int32) {
+	inRangeConf := this.configure.GetGlobalConf().DrawCard5StarsInRange
+	if len(inRangeConf) == 3 {
+		iStart := inRangeConf[0] // 抽卡开始
+		iEnd := inRangeConf[1]   // 抽卡结束
+		star := inRangeConf[2]
+		if star >= 3 { // 保底必须三星+
+			if heroRecord.Inevitable == 0 && heroRecord.Drawcount > iStart && heroRecord.Drawcount < iEnd && iEnd >= iStart {
+				n, _ := rand.Int(rand.Reader, big.NewInt(int64(iEnd-iStart)))
+				if n.Int64() < 1 { // 抽中
+					starIndex = star
+					heroRecord.Inevitable = heroRecord.Drawcount
+					update := make(map[string]interface{})
+					update["inevitable"] = heroRecord.Drawcount
+
+					get = true
+				}
+			}
+			// 保底情况
+			if heroRecord.Drawcount == iEnd && heroRecord.Inevitable == 0 {
+				starIndex = star
+				heroRecord.Inevitable = heroRecord.Drawcount
+
+				get = true
+			}
+		}
+	}
+	get = false
+	return
+}

pb/hero_db.pb.go

@@ -388,6 +388,7 @@ type DBHeroRecord struct {
 	Onebuy      int32            `protobuf:"varint,11,opt,name=onebuy,proto3" json:"onebuy"`                                                                                              // 单次购买次数
 	Tenbuy      int32            `protobuf:"varint,12,opt,name=tenbuy,proto3" json:"tenbuy"`                                                                                              // 十连购买次数
 	Inevitable  int32            `protobuf:"varint,13,opt,name=inevitable,proto3" json:"inevitable"`                                                                                      //第2-30次抽奖必出一个5星英雄
+	Inevitable1 int32            `protobuf:"varint,14,opt,name=inevitable1,proto3" json:"inevitable1"`                                                                                    //第30-50次抽奖必出一个5星英雄
 }
 
 func (x *DBHeroRecord) Reset() {
@@ -513,6 +514,13 @@ func (x *DBHeroRecord) GetInevitable() int32 {
 	return 0
 }
 
+func (x *DBHeroRecord) GetInevitable1() int32 {
+	if x != nil {
+		return x.Inevitable1
+	}
+	return 0
+}
+
 // 英雄天赋系统
 type DBHeroTalent struct {
 	state         protoimpl.MessageState
@@ -693,7 +701,7 @@ var file_hero_hero_db_proto_rawDesc = []byte{
 	0x70, 0x65, 0x72, 0x74, 0x79, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65,
 	0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05,
 	0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c,
-	0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x90, 0x04, 0x0a, 0x0c, 0x44, 0x42, 0x48, 0x65, 0x72,
+	0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0xb2, 0x04, 0x0a, 0x0c, 0x44, 0x42, 0x48, 0x65, 0x72,
 	0x6f, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20,
 	0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x02,
 	0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x73, 0x74, 0x61,
@@ -718,31 +726,33 @@ var file_hero_hero_db_proto_rawDesc = []byte{
 	0x6e, 0x65, 0x62, 0x75, 0x79, 0x12, 0x16, 0x0a, 0x06, 0x74, 0x65, 0x6e, 0x62, 0x75, 0x79, 0x18,
 	0x0c, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x74, 0x65, 0x6e, 0x62, 0x75, 0x79, 0x12, 0x1e, 0x0a,
 	0x0a, 0x69, 0x6e, 0x65, 0x76, 0x69, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x18, 0x0d, 0x20, 0x01, 0x28,
-	0x05, 0x52, 0x0a, 0x69, 0x6e, 0x65, 0x76, 0x69, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x1a, 0x3c, 0x0a,
+	0x05, 0x52, 0x0a, 0x69, 0x6e, 0x65, 0x76, 0x69, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x12, 0x20, 0x0a,
-	0x0e, 0x43, 0x6f, 0x6e, 0x64, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12,
+	0x0b, 0x69, 0x6e, 0x65, 0x76, 0x69, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x31, 0x18, 0x0e, 0x20, 0x01,
+	0x28, 0x05, 0x52, 0x0b, 0x69, 0x6e, 0x65, 0x76, 0x69, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x31, 0x1a,
+	0x3c, 0x0a, 0x0e, 0x43, 0x6f, 0x6e, 0x64, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x45, 0x6e, 0x74, 0x72,
+	0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03,
+	0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01,
+	0x28, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x3c, 0x0a,
+	0x0e, 0x53, 0x74, 0x61, 0x72, 0x35, 0x48, 0x65, 0x72, 0x6f, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12,
 	0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65,
 	0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05,
-	0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x3c, 0x0a, 0x0e, 0x53,
+	0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0xb6, 0x01, 0x0a, 0x0c,
-	0x74, 0x61, 0x72, 0x35, 0x48, 0x65, 0x72, 0x6f, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a,
+	0x44, 0x42, 0x48, 0x65, 0x72, 0x6f, 0x54, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x12, 0x0e, 0x0a, 0x02,
-	0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12,
+	0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x10, 0x0a, 0x03,
-	0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05,
+	0x75, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x16,
-	0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0xb6, 0x01, 0x0a, 0x0c, 0x44, 0x42,
+	0x0a, 0x06, 0x68, 0x65, 0x72, 0x6f, 0x49, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06,
-	0x48, 0x65, 0x72, 0x6f, 0x54, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64,
+	0x68, 0x65, 0x72, 0x6f, 0x49, 0x64, 0x12, 0x31, 0x0a, 0x06, 0x74, 0x61, 0x6c, 0x65, 0x6e, 0x74,
-	0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69,
+	0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x44, 0x42, 0x48, 0x65, 0x72, 0x6f, 0x54,
-	0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x16, 0x0a, 0x06,
+	0x61, 0x6c, 0x65, 0x6e, 0x74, 0x2e, 0x54, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x45, 0x6e, 0x74, 0x72,
-	0x68, 0x65, 0x72, 0x6f, 0x49, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x68, 0x65,
+	0x79, 0x52, 0x06, 0x74, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x1a, 0x39, 0x0a, 0x0b, 0x54, 0x61, 0x6c,
-	0x72, 0x6f, 0x49, 0x64, 0x12, 0x31, 0x0a, 0x06, 0x74, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x18, 0x04,
+	0x65, 0x6e, 0x74, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18,
-	0x20, 0x03, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x44, 0x42, 0x48, 0x65, 0x72, 0x6f, 0x54, 0x61, 0x6c,
+	0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61,
-	0x65, 0x6e, 0x74, 0x2e, 0x54, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52,
+	0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65,
-	0x06, 0x74, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x1a, 0x39, 0x0a, 0x0b, 0x54, 0x61, 0x6c, 0x65, 0x6e,
+	0x3a, 0x02, 0x38, 0x01, 0x2a, 0x2f, 0x0a, 0x08, 0x48, 0x65, 0x72, 0x6f, 0x54, 0x79, 0x70, 0x65,
-	0x74, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20,
+	0x12, 0x0f, 0x0a, 0x0b, 0x48, 0x65, 0x72, 0x6f, 0x54, 0x79, 0x70, 0x65, 0x4e, 0x69, 0x6c, 0x10,
-	0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75,
+	0x00, 0x12, 0x12, 0x0a, 0x0e, 0x48, 0x65, 0x72, 0x6f, 0x54, 0x79, 0x70, 0x65, 0x4b, 0x6f, 0x6e,
-	0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02,
+	0x67, 0x46, 0x75, 0x10, 0x01, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70,
-	0x38, 0x01, 0x2a, 0x2f, 0x0a, 0x08, 0x48, 0x65, 0x72, 0x6f, 0x54, 0x79, 0x70, 0x65, 0x12, 0x0f,
+	0x72, 0x6f, 0x74, 0x6f, 0x33,
-	0x0a, 0x0b, 0x48, 0x65, 0x72, 0x6f, 0x54, 0x79, 0x70, 0x65, 0x4e, 0x69, 0x6c, 0x10, 0x00, 0x12,
-	0x12, 0x0a, 0x0e, 0x48, 0x65, 0x72, 0x6f, 0x54, 0x79, 0x70, 0x65, 0x4b, 0x6f, 0x6e, 0x67, 0x46,
-	0x75, 0x10, 0x01, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f,
-	0x74, 0x6f, 0x33,
 }
 
 var (

sys/configure/structs/game.globalData.go

@@ -143,6 +143,8 @@ type GameGlobalData struct {
     DrawCardRechargeReward []int32
     DrawCardRegressionReward []int32
     DrawCard5StarsInRange []int32
+    DrawCard5StarsInRange1 []int32
+    DrawCard5StarsInRange1Pool string
     DrawCardContinuousRestrictionStar5 int32
     DrawCardContinuousRestrictionCamp int32
     EquipmentConsumption []int32
@@ -169,6 +171,8 @@ type GameGlobalData struct {
     GuildBossTroop2 int32
     GuildBossTroop3 int32
     Zhayantime float32
+    RotateAngle float32
+    RotateDizzyTime float32
 }
 
 const TypeId_GameGlobalData = 477542761
@@ -622,6 +626,21 @@ func (_v *GameGlobalData)Deserialize(_buf map[string]interface{}) (err error) {
                 }
             }
 
+     {
+                var _arr_ []interface{}
+                var _ok_ bool
+                if _arr_, _ok_ = _buf["DrawCard_5StarsInRange1"].([]interface{}); !_ok_ { err = errors.New("DrawCard_5StarsInRange1 error"); return }
+
+                _v.DrawCard5StarsInRange1 = 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.DrawCard5StarsInRange1 = append(_v.DrawCard5StarsInRange1, _list_v_)
+                }
+            }
+
+    { var _ok_ bool; if _v.DrawCard5StarsInRange1Pool, _ok_ = _buf["DrawCard_5StarsInRange1_pool"].(string); !_ok_ { err = errors.New("DrawCard_5StarsInRange1_pool error"); return } }
     { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["DrawCard_ContinuousRestriction_Star5"].(float64); !_ok_ { err = errors.New("DrawCard_ContinuousRestriction_Star5 error"); return }; _v.DrawCardContinuousRestrictionStar5 = int32(_tempNum_) }
     { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["DrawCard_ContinuousRestriction_Camp"].(float64); !_ok_ { err = errors.New("DrawCard_ContinuousRestriction_Camp error"); return }; _v.DrawCardContinuousRestrictionCamp = int32(_tempNum_) }
      {
@@ -700,6 +719,8 @@ func (_v *GameGlobalData)Deserialize(_buf map[string]interface{}) (err error) {
     { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["GuildBoss_troop2"].(float64); !_ok_ { err = errors.New("GuildBoss_troop2 error"); return }; _v.GuildBossTroop2 = int32(_tempNum_) }
     { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["GuildBoss_troop3"].(float64); !_ok_ { err = errors.New("GuildBoss_troop3 error"); return }; _v.GuildBossTroop3 = int32(_tempNum_) }
     { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["zhayantime"].(float64); !_ok_ { err = errors.New("zhayantime error"); return }; _v.Zhayantime = float32(_tempNum_) }
+    { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["rotateAngle"].(float64); !_ok_ { err = errors.New("rotateAngle error"); return }; _v.RotateAngle = float32(_tempNum_) }
+    { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["rotateDizzyTime"].(float64); !_ok_ { err = errors.New("rotateDizzyTime error"); return }; _v.RotateDizzyTime = float32(_tempNum_) }
     return
 }