Commit Graph

634 Commits (0f5ba79d9eae952d6441f2d1436f51413c625f81)

Author SHA1 Message Date
wangzhenxing 030431e3fc 合并0.1新功能修改 2024-01-03 15:24:49 +08:00
xiejun 86701e3a78 活动界面选择图表 2023-12-08 22:29:11 +08:00
wangzhenxing e4299072f4 名称替换 2023-12-07 00:09:44 +08:00
wangzhenxing 41716e2650 竞技场屏蔽奖励 防守记录入口 竞技场结果界面屏蔽回放 2023-12-06 19:07:04 +08:00
wangzhenxing 9df56f2cf6 七日狂欢 充值界面修改 2023-12-06 11:13:02 +08:00
wangzhenxing 902e27918f 活动按钮修改 2023-11-15 17:19:43 +08:00
wangzhenxing d9722c0f9f 活动界面显示修改 2023-11-08 16:57:26 +08:00
xiejun 443dbba568 充值UI修改 2023-10-20 18:51:12 +08:00
wangzhenxing bb18772265 Merge branch 'dev_oneDis' into onepiece_demo
# Conflicts:
#	Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleInfoPanel.prefab
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
2023-09-21 18:43:54 +08:00
wangzhenxing f2e064faf3 易经宝库修改 2023-09-21 15:17:39 +08:00
xiejun 6ced2b0507 Merge branch 'dev_oneDis' into onepiece_demo
# Conflicts:
#	AssetBundles/version.txt
#	Assets/ManagedResources/Prefabs/UI/FightLevel/FightLevelChapterPanel.prefab
#	Assets/ManagedResources/Prefabs/UI/ItemView/ItemView.prefab
#	Assets/ManagedResources/Prefabs/UI/Main/MainPanel.prefab
#	Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Effect.lua
#	Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/TalismanInfoPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Practice/PracticeManager.lua
#	Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleTalismanPanelV2.lua
2023-08-29 17:58:24 +08:00
wangzhenxing 4e388c1923 礼包提示修改 2023-08-17 13:44:14 +08:00
wangzhenxing bd11611e2d 易经宝库层级显示修改提交 最终大奖名字显示修改 2023-08-10 13:47:37 +08:00
xiejun fd8329bf90 海贼UI 2023-07-27 18:37:04 +08:00
wangzhenxing 7523d9d667 明望特权等级添加默认值 2023-07-26 15:15:52 +08:00
wangzhenxing d69827a119 寻宝迷踪红点修改提交 2023-02-02 18:28:51 +08:00
wangzhenxing f006e1aff4 寻宝迷踪红点提交 2023-01-29 15:17:03 +08:00
wangzhenxing 260db13451 超值基金,热榜红点提交 2023-01-16 14:37:14 +08:00
yuanshuai 84056854b4 名望特权bug修改 2022-12-28 10:12:58 +08:00
yuanshuai a25e17fa7f 轩辕宝镜挑战次数bug修改 2022-12-27 18:24:45 +08:00
yuanshuai b836038a31 降妖夺宝修改 2022-12-21 16:11:55 +08:00
yuanshuai 45517e7e27 珍奇宝阁屏蔽 2022-12-20 15:05:59 +08:00
wangzhenxing 093d259331 全民福利红点提交 2022-12-16 17:04:19 +08:00
wangzhenxing 782fc8e54e 点将台红点修改 2022-12-15 17:18:16 +08:00
wangzhenxing 161fbe7f5a 妖晶抽卡次数添加限制 2022-12-05 18:26:25 +08:00
wangzhenxing 83198aaf33 [bt]========寻仙招募添加title 2022-11-23 11:25:17 +08:00
wangzhenxing f1e9105b96 寻仙招募移到点将台修改 2022-11-14 17:43:00 +08:00
wangzhenxing 3c1e1c389d 添加名望特权红点 2022-11-08 18:33:09 +08:00
wangzhenxing b27dc2f3c3 [gm]========gm转盘修改 2022-10-28 15:45:53 +08:00
wangzhenxing 901cd5ff6c 乾坤宝盒显示修改 2022-10-21 14:31:54 +08:00
wangzhenxing 8d63d391a6 [gm]==============声望特权提交 2022-10-20 17:48:00 +08:00
wangzhenxing 65a79d27d4 [gm]=====抽卡消耗显示修改 2022-10-19 18:04:28 +08:00
wangzhenxing 19e5205496 [限时招募礼包]====红点提交 2022-08-18 18:01:14 +08:00
wangzhenxing bb9f877652 [显示招募]====添加珍奇宝阁 2022-08-17 17:45:12 +08:00
wangzhenxing 5741d68dd3 [灵兽宝阁]=====添加妖晶召唤上限 2022-08-04 16:40:37 +08:00
wangzhenxing ff2d384861 Merge branch 'china/test' into china/dev 2022-07-19 17:50:54 +08:00
wangzhenxing cfa92014de [升星有礼]=======修改提交 2022-07-19 17:26:30 +08:00
wangzhenxing f0eadfcc1f Merge branch 'china/dev' into china/test 2022-06-21 15:26:56 +08:00
wangzhenxing 5fe8fec06c [连冲返利]=======添加空判断 2022-06-21 13:31:59 +08:00
wangzhenxing 88d574be95 【易经宝库】========一键挖宝修改 2022-06-20 16:24:02 +08:00
wangzhenxing 5ec4ff9fd5 【易经宝库】=======添加一键挖宝功能 2022-06-20 14:08:32 +08:00
wangzhenxing 5885d46076 【超值连冲】=======显示6元页签及6元红点 2022-06-17 16:08:13 +08:00
wangzhenxing d796a106bc [超值连冲]========活动修改红点修改 2022-06-17 16:00:48 +08:00
wangzhenxing 25683d637e Merge branch 'china/dev' into china/test 2022-05-25 17:24:34 +08:00
wangzhenxing e7df09c284 [寻仙招募]======修改提交 2022-05-23 11:29:10 +08:00
wangzhenxing 9eaabc293d Merge branch 'china/dev' into china/test 2022-05-20 13:07:27 +08:00
wangzhenxing 7de86a79eb Merge branch 'china/dev' into china/test 2022-04-25 13:51:38 +08:00
yuanshuai 9c9018b1da 终身卡功能提交 2022-05-18 19:39:19 +08:00
wangzhenxing 9a2f342ef7 【功能】======寻仙招募优化 2022-04-01 17:10:37 +08:00
wangzhenxing a13dd2939a [功能]================神系英雄添加提叫 2022-03-28 18:18:19 +08:00