Compare commits

merge into: yinmeng:anchorBattle

Branches Tags

yinmeng:master yinmeng:childrenDay yinmeng:cityLove yinmeng:development yinmeng:turn yinmeng:billiard yinmeng:2024-aprilFoolsDay yinmeng:identity yinmeng:2024-whiteLove yinmeng:goddessesDay yinmeng:luckGiftStyle yinmeng:2024-lover yinmeng:2024-yearBenefits yinmeng:giftWallRule yinmeng:2023-year yinmeng:2023-christmas yinmeng:spacTimeLuck yinmeng:rank yinmeng:report yinmeng:anchorBattle yinmeng:2023-ruffian yinmeng:level yinmeng:2023-halloween yinmeng:midAutumnFestival yinmeng:luckGiftText yinmeng:gold yinmeng:2023-qx yinmeng:switch yinmeng:privilegeCardRule yinmeng:myBenefits yinmeng:recharge

...

pull from: yinmeng:2023-christmas

Branches Tags

yinmeng:master yinmeng:childrenDay yinmeng:cityLove yinmeng:development yinmeng:turn yinmeng:billiard yinmeng:2024-aprilFoolsDay yinmeng:identity yinmeng:2024-whiteLove yinmeng:goddessesDay yinmeng:luckGiftStyle yinmeng:2024-lover yinmeng:2024-yearBenefits yinmeng:giftWallRule yinmeng:2023-year yinmeng:2023-christmas yinmeng:spacTimeLuck yinmeng:rank yinmeng:report yinmeng:anchorBattle yinmeng:2023-ruffian yinmeng:level yinmeng:2023-halloween yinmeng:midAutumnFestival yinmeng:luckGiftText yinmeng:gold yinmeng:2023-qx yinmeng:switch yinmeng:privilegeCardRule yinmeng:myBenefits yinmeng:recharge

41 Commits

anchorBatt ... 2023-chris

Author	SHA1	Message	Date
Dragon	e303549f56	替换规则	2023-12-21 14:26:18 +08:00
Dragon	35486e60b4	修改规则	2023-12-21 14:09:32 +08:00
Dragon	b6989b4833	修改图片	2023-12-20 19:14:16 +08:00
Dragon	56deed81b6	替换礼物数值	2023-12-20 18:53:23 +08:00
Dragon	40749d2fb0	替换ui	2023-12-20 18:42:59 +08:00
Dragon	3453148f1c	替换ui	2023-12-20 18:18:35 +08:00
Dragon	3e413929cb	修复领取奖励弹窗异常问题	2023-12-20 15:48:17 +08:00
Dragon	c2122786a9	新增活动结束弹窗逻辑	2023-12-20 10:39:39 +08:00
Dragon	8678f0f143	修复bug	2023-12-19 19:10:55 +08:00
Dragon	2cdd3d55ce	修复信封时间异常问题	2023-12-19 18:01:22 +08:00
Dragon	7a9b9092ec	修复圣诞bug	2023-12-19 17:29:40 +08:00
Dragon	582fe67771	修改样式下一步异常问题	2023-12-19 11:39:30 +08:00
Dragon	ce6df39c28	完成圣诞活动	2023-12-18 22:07:26 +08:00
Dragon	60b5b02b3e	暂存	2023-12-14 15:54:32 +08:00
Dragon	0adfc5a7f2	修改时空礼物昵称	2023-12-14 15:54:12 +08:00
Dragon	94098904a3	修改切换按钮大小	2023-12-11 16:32:11 +08:00
Dragon	6fc3988a34	优化点击效果	2023-12-11 16:02:57 +08:00
Dragon	20ce419a69	调整展示问题	2023-12-08 14:06:18 +08:00
Dragon	994f05f68e	新增时光幸运儿	2023-12-07 18:33:54 +08:00
Dragon	583e34a6fc	暂存时光幸运儿	2023-12-07 14:33:19 +08:00
Dragon	ecbf67b95a	替换个播房小时榜	2023-12-07 14:22:25 +08:00
Dragon	ff04a54b79	旧版首页榜单不给跳转用户信息和房间	2023-12-06 19:36:19 +08:00
Dragon	628fe50749	首页榜单隐藏点击跳转	2023-12-06 19:22:23 +08:00
Dragon	4fb89fff9b	替换铭牌申请	2023-12-06 17:29:16 +08:00
Dragon	f413ac7c09	修改小时榜条数	2023-12-06 16:42:11 +08:00
Dragon	3150046440	修复小时榜单异常问题	2023-12-06 16:23:03 +08:00
Dragon	8380e1a212	房间榜单跳转信息页	2023-12-06 12:01:17 +08:00
Dragon	a12c92c3cb	修复小时榜没热度问题	2023-12-06 11:52:27 +08:00
Dragon	a80a580369	修复ui异常问题	2023-12-05 15:58:46 +08:00
Dragon	9587b72908	修复榜单数据异常问题	2023-12-05 15:28:48 +08:00
Dragon	a78675c230	新增个播小时榜	2023-12-05 14:11:42 +08:00
Dragon	f696a3dcb4	完成小时榜和房间榜	2023-12-05 12:27:49 +08:00
Dragon	932f4003f6	完成房间小时榜完成静态页面房间榜	2023-12-05 10:35:53 +08:00
Dragon	d7914c1dbf	修复前三名字异常问题	2023-11-30 14:59:24 +08:00
Dragon	2a4cd12fe0	修复上期前三异常问题	2023-11-30 14:59:24 +08:00
Dragon	ccdc66b6e8	修复非前三动效不播放问题	2023-11-30 14:59:24 +08:00
Dragon	e856a0a6c5	修复bug	2023-11-30 14:59:23 +08:00
Dragon	1421103a4f	更新首页榜单	2023-11-30 14:59:23 +08:00
Dragon	51dea0d288	新建榜单分支	2023-11-30 14:59:23 +08:00
Dragon	f49e536409	替换等级出现繁体图片	2023-11-30 14:58:13 +08:00
Dragon	e82fd2f66a	新增举报页面	2023-11-24 18:52:38 +08:00

260 changed files with 16691 additions and 1812 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Expand all files Collapse all files

2425

view/yinmeng/activity/2023-christmas/css/index.css Normal file

File diff suppressed because it is too large Load Diff

2469

view/yinmeng/activity/2023-christmas/css/index.scss Normal file

File diff suppressed because it is too large Load Diff

BIN

view/yinmeng/activity/2023-christmas/images/actOut.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 27 KiB

BIN

view/yinmeng/activity/2023-christmas/images/again.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 7.7 KiB

BIN

view/yinmeng/activity/2023-christmas/images/back.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 16 KiB

BIN

view/yinmeng/activity/2023-christmas/images/c_envelope.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 92 KiB

BIN

view/yinmeng/activity/2023-christmas/images/dayTab1.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 4.6 KiB

BIN

view/yinmeng/activity/2023-christmas/images/dayTab2.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 4.2 KiB

BIN

view/yinmeng/activity/2023-christmas/images/dayTabAct1.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 4.1 KiB

BIN

view/yinmeng/activity/2023-christmas/images/dayTabAct2.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 3.8 KiB

BIN

view/yinmeng/activity/2023-christmas/images/envelopeTab1.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 13 KiB

BIN

view/yinmeng/activity/2023-christmas/images/envelopeTab2.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 14 KiB

BIN

view/yinmeng/activity/2023-christmas/images/envelopeTab3.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 14 KiB

BIN

view/yinmeng/activity/2023-christmas/images/envelopeTabAct1.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 16 KiB

BIN

view/yinmeng/activity/2023-christmas/images/envelopeTabAct2.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 17 KiB

BIN

view/yinmeng/activity/2023-christmas/images/envelopeTabAct3.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 17 KiB

BIN

view/yinmeng/activity/2023-christmas/images/f_envelope.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 162 KiB

BIN

view/yinmeng/activity/2023-christmas/images/giftBox.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 79 KiB

BIN

view/yinmeng/activity/2023-christmas/images/goLove.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 9.1 KiB

BIN

view/yinmeng/activity/2023-christmas/images/goToGift.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 7.9 KiB

BIN

view/yinmeng/activity/2023-christmas/images/h_envelope.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 208 KiB

BIN

view/yinmeng/activity/2023-christmas/images/header.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 990 KiB

BIN

view/yinmeng/activity/2023-christmas/images/heartbeat1.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 418 KiB

BIN

view/yinmeng/activity/2023-christmas/images/heartbeat1RightBut.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 8.8 KiB

BIN

view/yinmeng/activity/2023-christmas/images/heartbeat2.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 162 KiB

BIN

view/yinmeng/activity/2023-christmas/images/heartbeatGift.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 114 KiB

BIN

view/yinmeng/activity/2023-christmas/images/heartbeatGift1.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 20 KiB

BIN

view/yinmeng/activity/2023-christmas/images/heartbeatGift2.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 27 KiB

BIN

view/yinmeng/activity/2023-christmas/images/heartbeatGift3.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 39 KiB

BIN

view/yinmeng/activity/2023-christmas/images/heartbeatIng.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 12 KiB

BIN

view/yinmeng/activity/2023-christmas/images/heartbeatLeftBut.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 9.0 KiB

BIN

view/yinmeng/activity/2023-christmas/images/heartbeatLeftTs.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 23 KiB

BIN

view/yinmeng/activity/2023-christmas/images/heartbeatLiBg.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 1.1 KiB

BIN

view/yinmeng/activity/2023-christmas/images/heartbeatLits.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 5.7 KiB

BIN

view/yinmeng/activity/2023-christmas/images/heartbeatMyBg.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 1.1 KiB

BIN

view/yinmeng/activity/2023-christmas/images/heartbeatMyBg2.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 1.7 KiB

BIN

view/yinmeng/activity/2023-christmas/images/heartbeatMyts.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 7.3 KiB

BIN

view/yinmeng/activity/2023-christmas/images/heartbeatNot.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 17 KiB

BIN

view/yinmeng/activity/2023-christmas/images/heartbeatOut.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 14 KiB

BIN

view/yinmeng/activity/2023-christmas/images/heartbeatRightTs.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 27 KiB

BIN

view/yinmeng/activity/2023-christmas/images/heartbeatTab1.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 23 KiB

BIN

view/yinmeng/activity/2023-christmas/images/heartbeatTab2.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 22 KiB

BIN

view/yinmeng/activity/2023-christmas/images/heartbeatTabAct1.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 19 KiB

BIN

view/yinmeng/activity/2023-christmas/images/heartbeatTabAct2.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 18 KiB

BIN

view/yinmeng/activity/2023-christmas/images/heartbeatTopBut.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 4.0 KiB

BIN

view/yinmeng/activity/2023-christmas/images/heartbeatno1.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 20 KiB

BIN

view/yinmeng/activity/2023-christmas/images/heartbeatno2.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 13 KiB

BIN

view/yinmeng/activity/2023-christmas/images/heartbeatno3.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 12 KiB

BIN

view/yinmeng/activity/2023-christmas/images/heartbeattx23.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 3.2 KiB

BIN

view/yinmeng/activity/2023-christmas/images/heartbeatyx1.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 4.5 KiB

BIN

view/yinmeng/activity/2023-christmas/images/l_envelope.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 128 KiB

BIN

view/yinmeng/activity/2023-christmas/images/listBg.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 5.6 KiB

BIN

view/yinmeng/activity/2023-christmas/images/listLiBg.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 3.7 KiB

BIN

view/yinmeng/activity/2023-christmas/images/listLiTs.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 2.8 KiB

BIN

view/yinmeng/activity/2023-christmas/images/listMyBg.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 4.2 KiB

BIN

view/yinmeng/activity/2023-christmas/images/listMyTs.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 1.2 KiB

BIN

view/yinmeng/activity/2023-christmas/images/listRuleBg1.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 11 KiB

BIN

view/yinmeng/activity/2023-christmas/images/listRuleBg2.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 11 KiB

BIN

view/yinmeng/activity/2023-christmas/images/listRule_icon.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 4.2 KiB

BIN

view/yinmeng/activity/2023-christmas/images/listRule_in1.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 177 KiB

BIN

view/yinmeng/activity/2023-christmas/images/listRule_in2.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 172 KiB

BIN

view/yinmeng/activity/2023-christmas/images/listTab1.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 10 KiB

BIN

view/yinmeng/activity/2023-christmas/images/listTab2.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 9.4 KiB

BIN

view/yinmeng/activity/2023-christmas/images/listTabAct1.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 8.8 KiB

BIN

view/yinmeng/activity/2023-christmas/images/listTabAct2.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 8.9 KiB

BIN

view/yinmeng/activity/2023-christmas/images/logo.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 21 KiB

BIN

view/yinmeng/activity/2023-christmas/images/lvgift1.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 12 KiB

BIN

view/yinmeng/activity/2023-christmas/images/lvgift2.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 18 KiB

BIN

view/yinmeng/activity/2023-christmas/images/lvgift3.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 25 KiB

BIN

view/yinmeng/activity/2023-christmas/images/lvgiftBg.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 28 KiB

BIN

view/yinmeng/activity/2023-christmas/images/myEnvlopTabs1.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 22 KiB

BIN

view/yinmeng/activity/2023-christmas/images/myEnvlopTabs2.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 22 KiB

BIN

view/yinmeng/activity/2023-christmas/images/myEnvlopTabsAct1.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 20 KiB

BIN

view/yinmeng/activity/2023-christmas/images/myEnvlopTabsAct2.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 20 KiB

BIN

view/yinmeng/activity/2023-christmas/images/next.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 16 KiB

BIN

view/yinmeng/activity/2023-christmas/images/nowLove.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 19 KiB

BIN

view/yinmeng/activity/2023-christmas/images/numBg.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 2.5 KiB

BIN

view/yinmeng/activity/2023-christmas/images/page3.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 14 KiB

BIN

view/yinmeng/activity/2023-christmas/images/pageBg1.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 374 KiB

BIN

view/yinmeng/activity/2023-christmas/images/pageContent1.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 78 KiB

BIN

view/yinmeng/activity/2023-christmas/images/ruleBg.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 28 KiB

BIN

view/yinmeng/activity/2023-christmas/images/ruleEnvlop_in.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 39 KiB

BIN

view/yinmeng/activity/2023-christmas/images/ruleEnvlop_inIKonw.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 7.4 KiB

BIN

view/yinmeng/activity/2023-christmas/images/rule_icon.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 12 KiB

BIN

view/yinmeng/activity/2023-christmas/images/rule_in.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 164 KiB

BIN

view/yinmeng/activity/2023-christmas/images/style1.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 41 KiB

BIN

view/yinmeng/activity/2023-christmas/images/style1Rule_icon.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 11 KiB

BIN

view/yinmeng/activity/2023-christmas/images/style2.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 50 KiB

BIN

view/yinmeng/activity/2023-christmas/images/style3.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 55 KiB

BIN

view/yinmeng/activity/2023-christmas/images/style4.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 61 KiB

BIN

view/yinmeng/activity/2023-christmas/images/sureLoveNot.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 8.1 KiB

BIN

view/yinmeng/activity/2023-christmas/images/sureLoveOk.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 7.3 KiB

BIN

view/yinmeng/activity/2023-christmas/images/sureLove_in.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 73 KiB

BIN

view/yinmeng/activity/2023-christmas/images/sureLove_in2.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 27 KiB

BIN

view/yinmeng/activity/2023-christmas/images/tab.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 22 KiB

BIN

view/yinmeng/activity/2023-christmas/images/tab1.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 22 KiB

BIN

view/yinmeng/activity/2023-christmas/images/tab2.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 24 KiB

BIN

view/yinmeng/activity/2023-christmas/images/tab3.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 23 KiB

BIN

view/yinmeng/activity/2023-christmas/images/timeTab.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 1.1 KiB

BIN

view/yinmeng/activity/2023-christmas/images/timeTabAct.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 1.6 KiB

Some files were not shown because too many files have changed in this diff Show More