Compare commits

merge into: 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

...

pull from: yinmeng:2024-lover

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

36 Commits

2023-chris ... 2024-lover

Author	SHA1	Message	Date
Dragon	f4a2bce138	完成音萌情人节活动	2024-02-05 21:10:25 +08:00
Dragon	4b0993dee3	完成首页任务接口联调暂存	2024-02-05 21:10:20 +08:00
Dragon	ff64c396ec	暂存	2024-02-05 21:10:20 +08:00
Dragon	3c195a0f6b	修改字段	2024-02-05 21:05:23 +08:00
Dragon	2d917ebbc3	替换图片	2024-02-05 20:53:55 +08:00
Dragon	626bc1d02e	新增新春榜单	2024-02-05 20:33:34 +08:00
Dragon	3f33eb88c9	修改礼物规则说明	2024-02-04 11:22:42 +08:00
Dragon	adc938511d	修改官网标题	2024-02-03 12:29:47 +08:00
Dragon	da5a6ca993	新增礼物墙规则	2024-01-30 15:27:42 +08:00
Dragon	2ed22d00fa	替换榜单	2024-01-23 21:38:57 +08:00
Dragon	214c67d792	替换桌球榜单	2024-01-23 19:56:10 +08:00
Dragon	1e97695c3e	替换图片	2024-01-22 21:31:45 +08:00
Dragon	008764107c	替换桌球争霸赛榜单	2024-01-22 20:29:56 +08:00
Dragon	4bd5aa0804	替换页面2榜单	2024-01-22 14:27:24 +08:00
Dragon	2a1eb57cb9	新增榜单数据	2024-01-22 13:35:24 +08:00
Dragon	a228ecd21d	替换图片	2024-01-19 09:55:17 +08:00
Dragon	180d06864e	新增主视觉时间	2024-01-19 09:51:19 +08:00
Dragon	f30a3f4e3f	新增桌球争霸赛	2024-01-18 20:00:42 +08:00
Dragon	1a48518d81	优化实名认证文案	2024-01-16 18:59:27 +08:00
Dragon	45abdc199b	替换规则	2024-01-04 18:23:48 +08:00
Dragon	89297793fc	替换定位落地页	2024-01-04 11:31:23 +08:00
Dragon	9ddc2235e1	替换官网图	2024-01-03 16:56:20 +08:00
Dragon	1f43e8aa00	修改小时榜时间	2024-01-03 16:36:18 +08:00
Dragon	2bb0a49be4	替换规则	2024-01-03 14:59:35 +08:00
Dragon	34f0f7a5d0	补齐无聊	2024-01-03 10:42:42 +08:00
Dragon	98a39deb05	修复明厅房间展示异常问题	2023-12-29 18:55:30 +08:00
Dragon	a9200835c9	修复小时榜bug	2023-12-29 16:02:21 +08:00
Dragon	6427915819	修复榜单显示bug	2023-12-29 16:02:20 +08:00
Dragon	9aed05e0ec	修复bug	2023-12-29 16:02:20 +08:00
Dragon	4005614234	修复任务问题	2023-12-29 16:02:20 +08:00
Dragon	f9bcf82333	修复bug	2023-12-29 16:02:20 +08:00
Dragon	d2fd4dfdc1	调整倒计时	2023-12-29 16:02:18 +08:00
Dragon	910184977c	清除公共测试数据代码	2023-12-29 16:02:16 +08:00
Dragon	5e446976e9	完成年度活动	2023-12-29 16:02:16 +08:00
Dragon	ae2fceb71d	完成组合榜单暂存	2023-12-29 16:02:12 +08:00
Dragon	3ceba9d53a	修改官网	2023-12-29 16:01:53 +08:00

251 changed files with 16907 additions and 2 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

3266

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

File diff suppressed because it is too large Load Diff

3280

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

File diff suppressed because it is too large Load Diff

BIN

view/yinmeng/activity/2023-year/images/NO1.png Normal file

Binary file not shown.

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

BIN

view/yinmeng/activity/2023-year/images/NO2.png Normal file

Binary file not shown.

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

BIN

view/yinmeng/activity/2023-year/images/NO3.png Normal file

Binary file not shown.

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

BIN

view/yinmeng/activity/2023-year/images/NOBg1.png Normal file

Binary file not shown.

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

BIN

view/yinmeng/activity/2023-year/images/NOBg2.png Normal file

Binary file not shown.

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

BIN

view/yinmeng/activity/2023-year/images/NOBg3.png Normal file

Binary file not shown.

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

BIN

view/yinmeng/activity/2023-year/images/NOts1.png Normal file

Binary file not shown.

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

BIN

view/yinmeng/activity/2023-year/images/NOts23.png Normal file

Binary file not shown.

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

BIN

view/yinmeng/activity/2023-year/images/actOutBg.png Normal file

Binary file not shown.

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

BIN

view/yinmeng/activity/2023-year/images/actOutBut.png Normal file

Binary file not shown.

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

BIN

view/yinmeng/activity/2023-year/images/celebrationTaskAct.png Normal file

Binary file not shown.

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

BIN

view/yinmeng/activity/2023-year/images/celebrationTaskAct1.png Normal file

Binary file not shown.

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

BIN

view/yinmeng/activity/2023-year/images/celebrationTaskActNot.png Normal file

Binary file not shown.

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

BIN

view/yinmeng/activity/2023-year/images/celebrationTaskBox.png Normal file

Binary file not shown.

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

BIN

view/yinmeng/activity/2023-year/images/celebrationTaskBoxGiftBox.png Normal file

Binary file not shown.

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

BIN

view/yinmeng/activity/2023-year/images/celebrationTaskBut.png Normal file

Binary file not shown.

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

BIN

view/yinmeng/activity/2023-year/images/celebrationTaskButAct.png Normal file

Binary file not shown.

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

BIN

view/yinmeng/activity/2023-year/images/celebrationTaskLeft.png Normal file

Binary file not shown.

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

BIN

view/yinmeng/activity/2023-year/images/celebrationTaskLine.png Normal file

Binary file not shown.

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

BIN

view/yinmeng/activity/2023-year/images/celebrationTaskRight.png Normal file

Binary file not shown.

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

BIN

view/yinmeng/activity/2023-year/images/celebrationTaskTitle.png Normal file

Binary file not shown.

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

BIN

view/yinmeng/activity/2023-year/images/celebrationTaskTs.png Normal file

Binary file not shown.

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

BIN

view/yinmeng/activity/2023-year/images/celebrationTasktopBox.png Normal file

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

view/yinmeng/activity/2023-year/images/page1Bg.png Normal file

Binary file not shown.

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

BIN

view/yinmeng/activity/2023-year/images/page1LiBg.png Normal file

Binary file not shown.

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

BIN

view/yinmeng/activity/2023-year/images/page1myBg.png Normal file

Binary file not shown.

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

BIN

view/yinmeng/activity/2023-year/images/page1myBg2.png Normal file

Binary file not shown.

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

BIN

view/yinmeng/activity/2023-year/images/page1myBoxLIbg.png Normal file

Binary file not shown.

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

BIN

view/yinmeng/activity/2023-year/images/page1notTop3ts.png Normal file

Binary file not shown.

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

BIN

view/yinmeng/activity/2023-year/images/page2-4-15.png Normal file

Binary file not shown.

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

BIN

view/yinmeng/activity/2023-year/images/page2Bg.png Normal file

Binary file not shown.

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

BIN

view/yinmeng/activity/2023-year/images/page2Gift1.png Normal file

Binary file not shown.

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

BIN

view/yinmeng/activity/2023-year/images/page2Gift2.png Normal file

Binary file not shown.

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

BIN

view/yinmeng/activity/2023-year/images/page2Gift3.png Normal file

Binary file not shown.

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

BIN

view/yinmeng/activity/2023-year/images/page2Gift4.png Normal file

Binary file not shown.

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

BIN

view/yinmeng/activity/2023-year/images/page2Gift5.png Normal file

Binary file not shown.

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

BIN

view/yinmeng/activity/2023-year/images/page2Gift6.png Normal file

Binary file not shown.

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

BIN

view/yinmeng/activity/2023-year/images/page2GiftBox.png Normal file

Binary file not shown.

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

BIN

view/yinmeng/activity/2023-year/images/page2No1.png Normal file

Binary file not shown.

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

BIN

view/yinmeng/activity/2023-year/images/page2No2.png Normal file

Binary file not shown.

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

BIN

view/yinmeng/activity/2023-year/images/page2No3.png Normal file

Binary file not shown.

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

BIN

view/yinmeng/activity/2023-year/images/page2NoBox.png Normal file

Binary file not shown.

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

BIN

view/yinmeng/activity/2023-year/images/page2Tab.png Normal file

Binary file not shown.

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

BIN

view/yinmeng/activity/2023-year/images/page2TabAct.png Normal file

Binary file not shown.

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

BIN

view/yinmeng/activity/2023-year/images/page2UlTs.png Normal file

Binary file not shown.

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

BIN

view/yinmeng/activity/2023-year/images/page3RuleIcon.png Normal file

Binary file not shown.

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

BIN

view/yinmeng/activity/2023-year/images/page3Tab.png Normal file

Binary file not shown.

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

BIN

view/yinmeng/activity/2023-year/images/page3TabAct.png Normal file

Binary file not shown.

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

BIN

view/yinmeng/activity/2023-year/images/page3TimeBox.png Normal file

Binary file not shown.

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

BIN

view/yinmeng/activity/2023-year/images/page3TitleIcon.png Normal file

Binary file not shown.

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

BIN

view/yinmeng/activity/2023-year/images/page3_popLibg.png Normal file

Binary file not shown.

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

BIN

view/yinmeng/activity/2023-year/images/page3_popLustTop3.png Normal file

Binary file not shown.

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

BIN

view/yinmeng/activity/2023-year/images/page3_popTOP1Bg.png Normal file

Binary file not shown.

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

BIN

view/yinmeng/activity/2023-year/images/page3_popTitle.png Normal file

Binary file not shown.

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

BIN

view/yinmeng/activity/2023-year/images/page3tabBox.png Normal file

Binary file not shown.

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

BIN

view/yinmeng/activity/2023-year/images/page3title.png Normal file

Binary file not shown.

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

BIN

view/yinmeng/activity/2023-year/images/page4Title2.png Normal file

Binary file not shown.

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

BIN

view/yinmeng/activity/2023-year/images/page4TitleIcon.png Normal file

Binary file not shown.

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

BIN

view/yinmeng/activity/2023-year/images/page4_popLiBg.png Normal file

Binary file not shown.

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

BIN

view/yinmeng/activity/2023-year/images/page4_popTop.png Normal file

Binary file not shown.

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

BIN

view/yinmeng/activity/2023-year/images/page4_popTop2.png Normal file

Binary file not shown.

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

BIN

view/yinmeng/activity/2023-year/images/pageMyicon.png Normal file

Binary file not shown.

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

BIN

view/yinmeng/activity/2023-year/images/popularity.png Normal file

Binary file not shown.

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

BIN

view/yinmeng/activity/2023-year/images/rule1.png Normal file

Binary file not shown.

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

BIN

view/yinmeng/activity/2023-year/images/rule2.png Normal file

Binary file not shown.

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

BIN

view/yinmeng/activity/2023-year/images/rule21.png Normal file

Binary file not shown.

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

BIN

view/yinmeng/activity/2023-year/images/rule22.png Normal file

Binary file not shown.

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

BIN

view/yinmeng/activity/2023-year/images/rule231.png Normal file

Binary file not shown.

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

BIN

view/yinmeng/activity/2023-year/images/rule232.png Normal file

Binary file not shown.

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

BIN

view/yinmeng/activity/2023-year/images/rule24.png Normal file

Binary file not shown.

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

BIN

view/yinmeng/activity/2023-year/images/rule25.png Normal file

Binary file not shown.

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

BIN

view/yinmeng/activity/2023-year/images/rule31.png Normal file

Binary file not shown.

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

BIN

view/yinmeng/activity/2023-year/images/rule32.png Normal file

Binary file not shown.

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

BIN

view/yinmeng/activity/2023-year/images/rule33.png Normal file

Binary file not shown.

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

BIN

view/yinmeng/activity/2023-year/images/rule34.png Normal file

Binary file not shown.

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

BIN

view/yinmeng/activity/2023-year/images/rule35.png Normal file

Binary file not shown.

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

BIN

view/yinmeng/activity/2023-year/images/rule41.png Normal file

Binary file not shown.

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

BIN

view/yinmeng/activity/2023-year/images/rule42.png Normal file

Binary file not shown.

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

BIN

view/yinmeng/activity/2023-year/images/rule43.png Normal file

Binary file not shown.

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

BIN

view/yinmeng/activity/2023-year/images/rule44.png Normal file

Binary file not shown.

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

BIN

view/yinmeng/activity/2023-year/images/rule45.png Normal file

Binary file not shown.

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

BIN

view/yinmeng/activity/2023-year/images/rule5.png Normal file

Binary file not shown.

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

BIN

view/yinmeng/activity/2023-year/images/ruleTab.png Normal file

Binary file not shown.

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

BIN

view/yinmeng/activity/2023-year/images/ruleTabAct.png Normal file

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

view/yinmeng/activity/2023-year/images/tabAct.png Normal file

Binary file not shown.

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

BIN

view/yinmeng/activity/2023-year/images/taksmp11.png Normal file

Binary file not shown.

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

BIN

view/yinmeng/activity/2023-year/images/taksmp12.png Normal file

Binary file not shown.

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

BIN

view/yinmeng/activity/2023-year/images/taksmp13.png Normal file

Binary file not shown.

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

BIN

view/yinmeng/activity/2023-year/images/taksmp21.png Normal file

Binary file not shown.

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

BIN

view/yinmeng/activity/2023-year/images/taksmp22.png Normal file

Binary file not shown.

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

BIN

view/yinmeng/activity/2023-year/images/taksqp11.png Normal file

Binary file not shown.

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

BIN

view/yinmeng/activity/2023-year/images/taksqp12.png Normal file

Binary file not shown.

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

BIN

view/yinmeng/activity/2023-year/images/taksqp13.png Normal file

Binary file not shown.

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

BIN

view/yinmeng/activity/2023-year/images/taksqp23.png Normal file

Binary file not shown.

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

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