Commit Graph

274 Commits (0b6d8ab978b7d0916870648a933320c00badee98)

Author SHA1 Message Date
wangzhenxing 0b6d8ab978 法相提交 2023-02-17 19:43:00 +08:00
yuanshuai d13e485b05 神将置换功能提交 2023-02-16 18:11:55 +08:00
yuanshuai 106c095086 宝箱红包类型道具获取概率弹窗 2022-12-07 18:26:11 +08:00
wangzhenxing 5c49a471da [gm]====送10万充提交 2022-11-28 18:40:45 +08:00
yuanshuai 45ad268ee8 神尊特权 幸运转盘 GM刷冲礼包功能优化 2022-11-03 10:57:45 +08:00
wangzhenxing 1e62991c2c [gm]=====开服冲榜提交 2022-10-31 18:13:41 +08:00
wangzhenxing ac078416dd [gm]======转盘提交 2022-10-27 15:32:13 +08:00
wangzhenxing 8d63d391a6 [gm]==============声望特权提交 2022-10-20 17:48:00 +08:00
wangzhenxing 436955609b 仙充直冲礼包提交 2022-10-13 14:54:03 +08:00
wangzhenxing efe732d91d [gm]=============刷冲特权提交 2022-09-23 15:24:10 +08:00
wangzhenxing a8f46604c9 [gm]======创角即送提交 2022-09-21 16:08:59 +08:00
wangzhenxing fdaec2ac28 [gm修改器]=====提交 2022-09-20 17:04:48 +08:00
wangzhenxing 5a1440cd69 [全民福利]=====提交 2022-09-15 16:48:56 +08:00
yuanshuai 23416c35cf Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2022-09-09 18:09:59 +08:00
yuanshuai d42106b07e 神尊特权提交 2022-09-09 18:09:45 +08:00
wangzhenxing b6b1f53d64 [bt]=====无限资源阁提交 2022-09-09 16:45:58 +08:00
yuanshuai 96f8605bb1 摘星阁脚本预设提交 2022-09-01 17:30:15 +08:00
yuanshuai d952b9a44c 数字游戏模块提交 2022-07-11 15:43:04 +08:00
wangzhenxing 6925105782 [周卡]======周卡提交 2022-06-01 09:34:41 +08:00
yuanshuai 9c9018b1da 终身卡功能提交 2022-05-18 19:39:19 +08:00
yuanshuai 160d974cbc 变身卡界面调整提交 2022-04-24 22:13:28 +08:00
yuanshuai 26970aee68 身外化身功能提交 2022-04-24 16:50:24 +08:00
yuanshuai 765134f4b3 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
# Conflicts:
#	Assets/ManagedResources/Prefabs/UI/Bag/BagPanel.prefab
#	Assets/ManagedResources/~Lua/Data/UIData.lua
#	Assets/ManagedResources/~Lua/Message/HeroInfoProto_pb.lua
#	Assets/ManagedResources/~Lua/Modules/Bag/BagPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Incarnation/IncarnationManager.lua
2022-04-22 18:33:04 +08:00
yuanshuai c3919b7e82 变身卡强化相关代码提交 2022-04-22 18:24:33 +08:00
wangzhenxing ca2b699259 神印提交 2022-04-22 18:23:01 +08:00
yuanshuai 9ebdab46b3 挑战副本相关脚本提交 2022-04-14 16:07:45 +08:00
jiaoyangna 17f855be9f 【ID1011382】
进阶好礼
2022-04-02 15:43:29 +08:00
wangzhenxing a13dd2939a [功能]================神系英雄添加提叫 2022-03-28 18:18:19 +08:00
jiaoyangna 31b1721510 探索提交 2022-03-17 15:21:08 +08:00
jiaoyangna 6b4cf31c3c 【ID1011205】
山河试炼调整到第一周开启,限时14天,投定向将
2022-03-02 17:48:52 +08:00
张彪 14af727eab 【战力冲刺】提交 2022-02-17 16:27:36 +08:00
wangzhenxing 109648ae93 Merge branch 'china/dev' into china/飞升 2022-01-19 16:13:20 +08:00
jiaoyangna b5cc0635ae Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
# Conflicts:
#	Assets/ManagedResources/~Lua/Data/UIData.lua
2022-01-18 14:49:50 +08:00
jiaoyangna ac24c2e0ce 【ID1010998】
【春节活动】签到领奖活动
2022-01-18 14:48:27 +08:00
wangzhenxing a6e05ae8e8 Merge branch 'china/dev' into china/飞升
Conflicts:
	Assets/ManagedResources/~Lua/Data/UIData.lua
2022-01-18 09:53:04 +08:00
wangzhenxing d5fd95373f [抽卡奖池]======抽卡奖池预览修改 2022-01-17 15:56:27 +08:00
wangzhenxing 0b3007a9c7 Merge branch 'china/dev' into china/飞升
Conflicts:
	Assets/ManagedResources/~Lua/Data/UIData.lua
2022-01-15 18:16:56 +08:00
ZhangBiao fa1c832170 【坐骑】增加详细信息 2022-01-15 13:00:45 +08:00
wangzhenxing e160d27be7 [飞升]=====uidata修改 2022-01-15 12:48:58 +08:00
wangzhenxing ef0a0ff436 Merge branch 'china/dev' into china/飞升
Conflicts:
	Assets/ManagedResources/Prefabs/UI/Battle/BattlePanel.prefab
	Assets/ManagedResources/Prefabs/UI/Formation/FormationPanelV2.prefab
	Assets/ManagedResources/Prefabs/UI/HandBook/HandBookHeroAndEquipListPanel.prefab
	Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleInfoPanel.prefab
	Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
	Assets/ManagedResources/~Lua/Data/UIData.lua
	Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua
	Assets/ManagedResources/~Lua/Modules/GlobalActTimeCtrl/ActTimeCtrlManager.lua
	Assets/ManagedResources/~Lua/Modules/HandBook/HandBookHeroAndEquipListPanel.lua
	Assets/ManagedResources/~Lua/Modules/HandBook/HandBookRoleInfoLayout.lua
	Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoPanel.lua
2022-01-15 12:47:22 +08:00
gaoxin dfb04baf75 【限时升星】添加可选择的升星有礼活动 2022-01-08 18:40:04 +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 b1be355601 Merge branch 'tansuo' into china/dev
# Conflicts:
#	Assets/ManagedResources/Atlas/ExploreAtlas.meta
#	Assets/ManagedResources/Prefabs/UI/Formation/FormationPanelV2.prefab
#	Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
2022-01-06 16:07:59 +08:00
ZhangBiao c0d27feac2 Merge branch 'china/dev' into 0功能/家园
# Conflicts:
#	Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
#	Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
2022-01-05 10:16:25 +08:00
jiaoyangna 57b0689de6 【ID1010911】
【森罗优化】退出森罗幻境时弹出累积收益
2021-12-30 18:06:36 +08:00
wangzhenxing 73d92664de [飞升]=======飞升逻辑提交 2021-12-28 16:20:07 +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
wangzhenxing 380b0bdb78 [飞升]=============飞升代码提交 2021-12-27 16:39:38 +08:00
jiaoyangna 5d37c0d4d9 探索提交 2021-12-23 17:23:02 +08:00
ZhangBiao 6fe4e5d3f6 Merge branch 'china/dev' into 0功能/家园 2021-12-23 14:49:47 +08:00