Commit Graph

189 Commits (06a1b0ea976a87cd7dd238f3b34229309406160d)

Author SHA1 Message Date
wangzhenxing 0e083205a3 命格修改提交 2023-09-01 12:34:34 +08:00
wangzhenxing 52393c592c 命石提交 2023-08-31 15:02:13 +08:00
PC-202302260912\Administrator 1b6b5ecdad 抽卡设置心愿修改提交 2023-06-20 17:14:48 +08:00
wangzhenxing ac078416dd [gm]======转盘提交 2022-10-27 15:32:13 +08:00
wangzhenxing 8d63d391a6 [gm]==============声望特权提交 2022-10-20 17:48:00 +08:00
yuanshuai d952b9a44c 数字游戏模块提交 2022-07-11 15:43:04 +08:00
wangzhenxing 6925105782 [周卡]======周卡提交 2022-06-01 09:34:41 +08:00
yuanshuai eca9a7d052 漏提交 2022-05-05 17:16:30 +08:00
wangzhenxing ca2b699259 神印提交 2022-04-22 18:23:01 +08:00
yuanshuai f8f14d06e9 挑战副本修改 2022-04-18 00:03:41 +08:00
yuanshuai 9ebdab46b3 挑战副本相关脚本提交 2022-04-14 16:07:45 +08:00
jiaoyangna 7a1ccac3cd 【ID1011398】
山河设计图每日玉衡龙魂丹领取调整
2022-04-02 14:45:12 +08:00
jiaoyangna 937ca23dc0 探索提交 2022-01-21 14:06:30 +08:00
jiaoyangna 90c21e5a73 协议提交 2022-01-20 16:17:26 +08:00
jiaoyangna a544abe9cc 众志成城 2022-01-19 17:47:07 +08:00
ZhangBiao 6b1c28a920 Merge branch 'china/dev' into 0功能/家园
# Conflicts:
#	Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralInfoPopup.prefab
#	Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab
#	Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
#	Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
#	Assets/ManagedResources/~Lua/Common/Managers.lua
#	Assets/ManagedResources/~Lua/Message/CommonProto_pb.lua
#	Assets/ManagedResources/~Lua/Message/PlayerInfoProto_pb.lua
#	Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Net/IndicationManager.lua
#	Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
#	Assets/ManagedResources/~Lua/Modules/Player/JumpManager.lua
#	Assets/ManagedResources/~Lua/View/UpView.lua
2022-01-06 16:40:24 +08:00
jiaoyangna 7b67ef38df Merge branch 'china/dev' into tansuo
# Conflicts:
#	Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
#	Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua
2021-12-30 11:43:22 +08:00
ZhangBiao 44aa663ab0 Merge branch 'china/dev' into 0功能/家园 2021-12-30 11:24:38 +08:00
jiaoyangna f0a4cec767 【ID1010975】
【优化】超值返利每日首次登陆有红点提示
2021-12-29 17:10:48 +08:00
jiaoyangna 657574b61a 探索地图修改提交 2021-12-29 16:21:59 +08:00
jiaoyangna 89c298f593 探索地图修改提交 2021-12-29 16:05:16 +08:00
jiaoyangna 978689d9a7 探索提交 2021-12-28 17:52:28 +08:00
jiaoyangna 5e75e2384e 探索提交 2021-12-28 15:31:46 +08:00
ZhangBiao 69cb591edb 【家园】升级进度条 2021-12-28 13:37:04 +08:00
jiaoyangna 9dafa85858 探索提交 2021-12-28 13:30:27 +08:00
ZhangBiao b66cfdc61d 【家园】提交 2021-12-28 11:54:08 +08:00
jiaoyangna d83373ecab Merge branch 'china/dev' into tansuo
# Conflicts:
#	Assets/ManagedResources/Prefabs/Map/SingleExplorePlayerView.prefab
#	Assets/ManagedResources/Prefabs/UI/ContinuePackage/PremiumRebatePanel.prefab
#	Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralInfoPopup.prefab
#	Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab
#	Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
#	Assets/ManagedResources/~Lua/Data/ConfigData.lua
#	Assets/ManagedResources/~Lua/Data/UIData.lua
#	Assets/ManagedResources/~Lua/Logic/GameEvent.lua
#	Assets/ManagedResources/~Lua/Message/CommonProto_pb.lua
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
#	Assets/ManagedResources/~Lua/Modules/ContinuePackage/PremiumRebatePanel.lua
#	Assets/ManagedResources/~Lua/Modules/Fight/View/ExploreMapView.lua
#	Assets/ManagedResources/~Lua/Modules/GeneralPanel/GeneralInfoPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Guide/GuideManager.lua
#	Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/GeneralPopup.lua
#	Assets/ManagedResources/~Lua/View/JumpViewNew.lua
#	Assets/ManagedResources/~Lua/View/SingleExplorePlayerView.lua
2021-12-27 17:00:14 +08:00
jiaoyangna d2271d89b6 探索提交 2021-12-22 12:07:00 +08:00
ZhangBiao f4b2a09f08 【商城界面】和信任商城 2021-12-17 12:08:15 +08:00
ZhangBiao 45241e1d5d 【商城界面】提交 2021-12-17 11:28:37 +08:00
ZhangBiao 5393485f65 【商城界面】提交 2021-12-16 19:22:46 +08:00
ZhangBiao c915a3b9eb 【协议】提交 2021-12-16 17:00:47 +08:00
ZhangBiao 68d6e39882 【协议】提交 2021-12-16 16:58:20 +08:00
ZhangBiao e9954f49f2 【商城界面】提交 2021-12-16 11:59:18 +08:00
ZhangBiao d39153607b 【灵兽特惠】倒计时修改 2021-11-29 13:40:53 +08:00
ZhangBiao c8d4cadb2b 【灵脉秘境】提交 2021-11-19 15:38:41 +08:00
ZhangBiao c994c9e636 【灵脉秘境】提交 2021-11-18 18:43:22 +08:00
ZhangBiao 7d0a24a3cc 【灵脉秘境】提交 2021-11-18 17:15:16 +08:00
ZhangBiao 015341b7a6 【灵脉秘境】提交 2021-11-18 15:49:39 +08:00
gaoxin c00a3b603e 【Vip】修复等级奖励刷新不及时的问题 2021-11-12 10:07:44 +08:00
ZhangBiao 76b7b5caca 【log】提交 2021-11-08 15:59:56 +08:00
gaoxin 0c81ddfefe 【周卡】停留在周卡界面跨天时刷新界面显示 2021-10-29 18:27:23 +08:00
gaoxin d23318b53d 【周卡】红点添加,协议修改,推送逻辑添加 2021-10-29 16:43:53 +08:00
gaoxin 85b15d6cb7 Merge branch 'china/dev' into 0活动开发聚集地/挚礼月卡 2021-10-20 15:14:38 +08:00
gaoxin 3c371623d7 【山河每日奖励】完善奖励领取逻辑 2021-10-19 17:07:32 +08:00
gaoxin 3a559c912c 【挚礼月卡】月卡功能数据剥离到MonthCardManager 2021-10-18 16:22:11 +08:00
jiaoyangna 101f406a4c 【ID1010469】
好感度优化
2021-10-14 20:15:53 +08:00
jiaoyangna ac0221b89f 白金装备修改提交 2021-10-14 15:05:36 +08:00
jiaoyangna 8de35750c6 【ID1010413】
【新功能】玩家等级提升时 发放道具进背包
2021-10-08 11:34:48 +08:00
jiaoyangna b44c4af217 好感度0点次数刷新修改 2021-09-29 18:23:13 +08:00