liwei_3d/go_dreamfactory
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source
This commit is contained in:
meixiongfeng 2023-03-16 15:14:03 +08:00
commit 5b25ca43e7
9 changed files with 2433 additions and 2430 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
bin/json/game_pandamasjs.json
View File

@ -1,14 +1,14 @@
[ [
{ {
"id": 1, "id": 1,
"unlock_condition": 6000001 "unlock_condition": 20010
}, },
{ {
"id": 2, "id": 2,
"unlock_condition": 6000002 "unlock_condition": 20011
}, },
{ {
"id": 3, "id": 3,
"unlock_condition": 6000003 "unlock_condition": 20012
} }
] ]

48
bin/json/game_pandamasmryl.json
View File

@ -5,9 +5,9 @@
"key": "wuguandongzuo_101", "key": "wuguandongzuo_101",
"text": "开合跳" "text": "开合跳"
}, },
"icon": "", "icon": "wg_js_dz001",
"des": { "des": {
"key": "wuguandongzuo_", "key": "wuguandongzuo_wg_js_dz001",
"text": "开合跳" "text": "开合跳"
}, },
"ticks": 3, "ticks": 3,
@ -20,9 +20,9 @@
"key": "wuguandongzuo_102", "key": "wuguandongzuo_102",
"text": "手臂环绕" "text": "手臂环绕"
}, },
"icon": "", "icon": "wg_js_dz001",
"des": { "des": {
"key": "wuguandongzuo_", "key": "wuguandongzuo_wg_js_dz001",
"text": "手臂环绕" "text": "手臂环绕"
}, },
"ticks": 3, "ticks": 3,
@ -35,9 +35,9 @@
"key": "wuguandongzuo_103", "key": "wuguandongzuo_103",
"text": "肩部拉伸" "text": "肩部拉伸"
}, },
"icon": "", "icon": "wg_js_dz001",
"des": { "des": {
"key": "wuguandongzuo_", "key": "wuguandongzuo_wg_js_dz001",
"text": "肩部拉伸" "text": "肩部拉伸"
}, },
"ticks": 3, "ticks": 3,
@ -50,9 +50,9 @@
"key": "wuguandongzuo_104", "key": "wuguandongzuo_104",
"text": "波比" "text": "波比"
}, },
"icon": "", "icon": "wg_js_dz001",
"des": { "des": {
"key": "wuguandongzuo_", "key": "wuguandongzuo_wg_js_dz001",
"text": "波比" "text": "波比"
}, },
"ticks": 3, "ticks": 3,
@ -65,9 +65,9 @@
"key": "wuguandongzuo_105", "key": "wuguandongzuo_105",
"text": "交错俯卧撑" "text": "交错俯卧撑"
}, },
"icon": "", "icon": "wg_js_dz001",
"des": { "des": {
"key": "wuguandongzuo_", "key": "wuguandongzuo_wg_js_dz001",
"text": "交错俯卧撑" "text": "交错俯卧撑"
}, },
"ticks": 3, "ticks": 3,
@ -80,9 +80,9 @@
"key": "wuguandongzuo_106", "key": "wuguandongzuo_106",
"text": "钻石俯卧撑" "text": "钻石俯卧撑"
}, },
"icon": "", "icon": "wg_js_dz001",
"des": { "des": {
"key": "wuguandongzuo_", "key": "wuguandongzuo_wg_js_dz001",
"text": "钻石俯卧撑" "text": "钻石俯卧撑"
}, },
"ticks": 3, "ticks": 3,
@ -95,9 +95,9 @@
"key": "wuguandongzuo_107", "key": "wuguandongzuo_107",
"text": "掌上压后转身" "text": "掌上压后转身"
}, },
"icon": "", "icon": "wg_js_dz001",
"des": { "des": {
"key": "wuguandongzuo_", "key": "wuguandongzuo_wg_js_dz001",
"text": "掌上压后转身" "text": "掌上压后转身"
}, },
"ticks": 3, "ticks": 3,
@ -110,9 +110,9 @@
"key": "wuguandongzuo_108", "key": "wuguandongzuo_108",
"text": "眼镜蛇式拉伸" "text": "眼镜蛇式拉伸"
}, },
"icon": "", "icon": "wg_js_dz001",
"des": { "des": {
"key": "wuguandongzuo_", "key": "wuguandongzuo_wg_js_dz001",
"text": "眼镜蛇式拉伸" "text": "眼镜蛇式拉伸"
}, },
"ticks": 3, "ticks": 3,
@ -125,9 +125,9 @@
"key": "wuguandongzuo_109", "key": "wuguandongzuo_109",
"text": "胸部拉伸" "text": "胸部拉伸"
}, },
"icon": "", "icon": "wg_js_dz001",
"des": { "des": {
"key": "wuguandongzuo_", "key": "wuguandongzuo_wg_js_dz001",
"text": "胸部拉伸" "text": "胸部拉伸"
}, },
"ticks": 3, "ticks": 3,
@ -140,9 +140,9 @@
"key": "wuguandongzuo_110", "key": "wuguandongzuo_110",
"text": "原地跑" "text": "原地跑"
}, },
"icon": "", "icon": "wg_js_dz001",
"des": { "des": {
"key": "wuguandongzuo_", "key": "wuguandongzuo_wg_js_dz001",
"text": "原地跑" "text": "原地跑"
}, },
"ticks": 3, "ticks": 3,
@ -155,9 +155,9 @@
"key": "wuguandongzuo_111", "key": "wuguandongzuo_111",
"text": "深蹲" "text": "深蹲"
}, },
"icon": "", "icon": "wg_js_dz001",
"des": { "des": {
"key": "wuguandongzuo_", "key": "wuguandongzuo_wg_js_dz001",
"text": "深蹲" "text": "深蹲"
}, },
"ticks": 3, "ticks": 3,
@ -170,9 +170,9 @@
"key": "wuguandongzuo_112", "key": "wuguandongzuo_112",
"text": "仰卧起坐" "text": "仰卧起坐"
}, },
"icon": "", "icon": "wg_js_dz001",
"des": { "des": {
"key": "wuguandongzuo_", "key": "wuguandongzuo_wg_js_dz001",
"text": "仰卧起坐" "text": "仰卧起坐"
}, },
"ticks": 3, "ticks": 3,

3
modules/practice/api_enrolled.go
View File

@ -30,7 +30,10 @@ func (this *apiComp) Enrolled(session comm.IUserSession, req *pb.PracticeEnrolle
if code = this.module.ModuleHero.RegisterInstructor(session, req.Hero, req.Group); code != pb.ErrorCode_Success { if code = this.module.ModuleHero.RegisterInstructor(session, req.Hero, req.Group); code != pb.ErrorCode_Success {
return return
} }
for i := 0; i < len(req.Hero); i++ {
room.Full[req.Group]++ room.Full[req.Group]++
}
} else { } else {
if hero, err = this.module.ModuleHero.QueryCrossMultipleHeroinfo(req.Hero); err != nil { if hero, err = this.module.ModuleHero.QueryCrossMultipleHeroinfo(req.Hero); err != nil {
code = pb.ErrorCode_ReqParameterError code = pb.ErrorCode_ReqParameterError